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/07/09 16:40:48 UTC
svn commit: r209946 [2/3] - in /ibatis/trunk/cs/mapper: IBatisNet.Common/
IBatisNet.DataMapper.Test/Maps/Access/OleDb/
IBatisNet.DataMapper.Test/Maps/MSSQL/Odbc/
IBatisNet.DataMapper.Test/Maps/MSSQL/OleDb/
IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient...
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Other.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Other.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Other.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Other.xml Sat Jul 9 07:40:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<sqlMap namespace="Other" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="Other" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<alias>
<typeAlias alias="Other" type="IBatisNet.DataMapper.Test.Domain.Other, IBatisNet.DataMapper.Test"/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/ResultClass.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/ResultClass.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/ResultClass.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/ResultClass.xml Sat Jul 9 07:40:43 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<sqlMap namespace="ResultClass" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="ResultClass" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<statements>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Account.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Account.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Account.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Account.xml Sat Jul 9 07:40:43 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<sqlMap namespace="Account" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="Schemas\SqlMap.xsd">
+<sqlMap namespace="Account" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<!-- =============================================
<resultMap
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Category.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Category.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Category.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Category.xml Sat Jul 9 07:40:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<sqlMap namespace="Category" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="Category" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<alias>
<typeAlias alias="Category" type="IBatisNet.DataMapper.Test.Domain.Category, IBatisNet.DataMapper.Test"/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Complex.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Complex.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Complex.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Complex.xml Sat Jul 9 07:40:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
-<sqlMap namespace="Complex" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="Complex" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<statements>
<statement id="ComplexMap"
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Document.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Document.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Document.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Document.xml Sat Jul 9 07:40:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
-<sqlMap namespace="Document" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="Document" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<alias>
<typeAlias alias="Document" type="IBatisNet.DataMapper.Test.Domain.Document, IBatisNet.DataMapper.Test" />
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/DynamicAccount.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/DynamicAccount.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/DynamicAccount.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/DynamicAccount.xml Sat Jul 9 07:40:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
-<sqlMap namespace="Account" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="Account" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<alias>
<typeAlias alias="Search" type="IBatisNet.DataMapper.Test.Domain.Search, IBatisNet.DataMapper.Test"/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Enumeration.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Enumeration.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Enumeration.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Enumeration.xml Sat Jul 9 07:40:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<sqlMap namespace="Enumeration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="Enumeration" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<alias>
<typeAlias alias="Enumeration" type="IBatisNet.DataMapper.Test.Domain.Enumeration, IBatisNet.DataMapper.Test"/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/LineItem.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/LineItem.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/LineItem.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/LineItem.xml Sat Jul 9 07:40:43 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<sqlMap namespace="LineItem" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="LineItem" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<alias>
<typeAlias alias="LineItem" type="IBatisNet.DataMapper.Test.Domain.LineItem, IBatisNet.DataMapper.Test" />
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Order.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Order.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Order.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Order.xml Sat Jul 9 07:40:43 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<sqlMap namespace="Order" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="Order" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<alias>
<typeAlias alias="Order" type="IBatisNet.DataMapper.Test.Domain.Order, IBatisNet.DataMapper.Test" />
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Other.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Other.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Other.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Other.xml Sat Jul 9 07:40:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<sqlMap namespace="Other" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="Other" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<alias>
<typeAlias alias="Other" type="IBatisNet.DataMapper.Test.Domain.Other, IBatisNet.DataMapper.Test"/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/ResultClass.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/ResultClass.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/ResultClass.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/ResultClass.xml Sat Jul 9 07:40:43 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<sqlMap namespace="ResultClass" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="ResultClass" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<statements>
<statement id="GetBoolean"
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Account.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Account.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Account.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Account.xml Sat Jul 9 07:40:43 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<sqlMap namespace="Account" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="Account" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<!-- =============================================
<resultMap
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Category.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Category.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Category.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Category.xml Sat Jul 9 07:40:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<sqlMap namespace="Category" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="Category" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<alias>
<typeAlias alias="Category" type="IBatisNet.DataMapper.Test.Domain.Category, IBatisNet.DataMapper.Test"/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Complex.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Complex.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Complex.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Complex.xml Sat Jul 9 07:40:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
-<sqlMap namespace="Complex" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="Complex" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<statements>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Document.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Document.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Document.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Document.xml Sat Jul 9 07:40:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
-<sqlMap namespace="Document" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="Document" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<alias>
<typeAlias alias="Document" type="IBatisNet.DataMapper.Test.Domain.Document, IBatisNet.DataMapper.Test" />
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/DynamicAccount.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/DynamicAccount.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/DynamicAccount.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/DynamicAccount.xml Sat Jul 9 07:40:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
-<sqlMap namespace="Account" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="Account" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<alias>
<typeAlias alias="Search" type="IBatisNet.DataMapper.Test.Domain.Search, IBatisNet.DataMapper.Test"/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Enumeration.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Enumeration.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Enumeration.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Enumeration.xml Sat Jul 9 07:40:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<sqlMap namespace="Enumeration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="Enumeration" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<alias>
<typeAlias alias="Enumeration" type="IBatisNet.DataMapper.Test.Domain.Enumeration, IBatisNet.DataMapper.Test"/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/LineItem.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/LineItem.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/LineItem.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/LineItem.xml Sat Jul 9 07:40:43 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<sqlMap namespace="LineItem" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="LineItem" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<alias>
<typeAlias alias="LineItem" type="IBatisNet.DataMapper.Test.Domain.LineItem, IBatisNet.DataMapper.Test" />
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Order.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Order.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Order.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Order.xml Sat Jul 9 07:40:43 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<sqlMap namespace="Order" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="Order" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<alias>
<typeAlias alias="Order" type="IBatisNet.DataMapper.Test.Domain.Order, IBatisNet.DataMapper.Test" />
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Other.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Other.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Other.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Other.xml Sat Jul 9 07:40:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<sqlMap namespace="Other" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="Other" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<alias>
<typeAlias alias="Other" type="IBatisNet.DataMapper.Test.Domain.Other, IBatisNet.DataMapper.Test"/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/ResultClass.xml
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/ResultClass.xml?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/ResultClass.xml (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/ResultClass.xml Sat Jul 9 07:40:43 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<sqlMap namespace="ResultClass" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+<sqlMap namespace="ResultClass" xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMap.xsd">
<statements>
<statement id="GetBoolean"
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Access_OleDb.config
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Access_OleDb.config?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Access_OleDb.config (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Access_OleDb.config Sat Jul 9 07:40:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
+<sqlMapConfig xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMapConfig.xsd">
<properties resource="../../Database.config"/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config Sat Jul 9 07:40:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
+<sqlMapConfig xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMapConfig.xsd">
<properties>
<property resource="../../database.config"/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config Sat Jul 9 07:40:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
+<sqlMapConfig xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMapConfig.xsd">
<properties resource="../../database.config"/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config Sat Jul 9 07:40:43 2005
@@ -1,20 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
-<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
-
+<sqlMapConfig xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMapConfig.xsd">
+
<!-- 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="${useStatementNamespaces}"/>
<setting cacheModelsEnabled="true"/>
<setting validateSqlMap="false"/>
</settings>
-
<!-- Optional if resource -->
<providers resource="providers.config"/>
-
<!-- ==== SqlClient configuration ========= -->
<!-- Rem : If used via a DataAccess context, database tag will be ignored -->
<database>
@@ -22,19 +19,15 @@
<provider name="sqlServer1.1"/>
<dataSource name="iBatisNet" connectionString="data source=${datasource};database=${database};user id=${userid};password=${password};connection reset=false;connection lifetime=5; min pool size=1; max pool size=50"/>
</database>
-
<alias>
<typeAlias alias="Account" type="IBatisNet.DataMapper.Test.Domain.Account, IBatisNet.DataMapper.Test"/>
<typeAlias alias="OuiNonBool" type="IBatisNet.DataMapper.Test.Domain.OuiNonBoolTypeHandlerCallback, IBatisNet.DataMapper.Test"/>
</alias>
-
<typeHandlers>
<typeHandler type="bool" dbType="Varchar" callback="OuiNonBool"/>
</typeHandlers>
-
<sqlMaps>
-
- <!-- <sqlMap url="E:/Projet/iBatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/${directory}/MSSQL/SqlClient/Account.xml"/> -->
+ <!-- <sqlMap url="E:/Projet/iBatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/${directory}/MSSQL/SqlClient/Account.xml"/> -->
<sqlMap resource="../../${directory}/MSSQL/SqlClient/Account.xml"/>
<!-- Rem : If used as embbeded Resources, use
<sqlMap embedded="Maps.MSSQL.SqlClient.Account.xml, IBatisNet.DataMapper.Test"/>-->
@@ -48,6 +41,5 @@
<sqlMap resource="../../Maps/MSSQL/SqlClient/ResultClass.xml"/>
<sqlMap resource="../../Maps/MSSQL/SqlClient/Document.xml"/>
<sqlMap resource="../../Maps/MSSQL/SqlClient/EmbedParameter.xml"/>
-
</sqlMaps>
</sqlMapConfig>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MySql_ByteFx.config
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MySql_ByteFx.config?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MySql_ByteFx.config (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MySql_ByteFx.config Sat Jul 9 07:40:43 2005
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
+<sqlMapConfig xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMapConfig.xsd">
<!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
<properties resource="../../Database.config"/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MySql_MySql.config
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MySql_MySql.config?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MySql_MySql.config (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MySql_MySql.config Sat Jul 9 07:40:43 2005
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
+<sqlMapConfig xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMapConfig.xsd">
<!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
<properties resource="../../Database.config"/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_ODP.config
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_ODP.config?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_ODP.config (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_ODP.config Sat Jul 9 07:40:43 2005
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
+<sqlMapConfig xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMapConfig.xsd">
<!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
<properties resource="../../Database.config"/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_OracleClient.config
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_OracleClient.config?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_OracleClient.config (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_OracleClient.config Sat Jul 9 07:40:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
-
+<sqlMapConfig xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMapConfig.xsd">
<!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
<properties resource="../../Database.config"/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_PostgreSQL_Npgsql.config
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_PostgreSQL_Npgsql.config?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_PostgreSQL_Npgsql.config (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_PostgreSQL_Npgsql.config Sat Jul 9 07:40:43 2005
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
+<sqlMapConfig xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/SqlMapConfig.xsd">
<!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
<properties resource="../../Database.config"/>
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/providers.config Sat Jul 9 07:40:43 2005
@@ -1,233 +1,19 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<providers>
- <clear/>
- <provider
- name="sqlServer1.0"
- description="Microsoft SQL Server 7.0/2000, provider V1.0.3300.0 in framework .NET V1.0"
- enabled="false"
- assemblyName="System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
- connectionClass="System.Data.SqlClient.SqlConnection"
- commandClass="System.Data.SqlClient.SqlCommand"
- parameterClass="System.Data.SqlClient.SqlParameter"
- parameterDbTypeClass="System.Data.SqlDbType"
- parameterDbTypeProperty="SqlDbType"
- dataAdapterClass="System.Data.SqlClient.SqlDataAdapter"
- commandBuilderClass="System.Data.SqlClient.SqlCommandBuilder"
- usePositionalParameters = "false"
- useParameterPrefixInSql = "true"
- useParameterPrefixInParameter = "true"
- parameterPrefix="@"
- />
- <provider
- name="sqlServer1.1"
- description="Microsoft SQL Server 7.0/2000, provider V1.0.5000.0 in framework .NET V1.1"
- default="true"
- assemblyName="System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
- connectionClass="System.Data.SqlClient.SqlConnection"
- commandClass="System.Data.SqlClient.SqlCommand"
- parameterClass="System.Data.SqlClient.SqlParameter"
- parameterDbTypeClass="System.Data.SqlDbType"
- parameterDbTypeProperty="SqlDbType"
- dataAdapterClass="System.Data.SqlClient.SqlDataAdapter"
- commandBuilderClass="System.Data.SqlClient.SqlCommandBuilder"
- usePositionalParameters = "false"
- useParameterPrefixInSql = "true"
- useParameterPrefixInParameter = "true"
- parameterPrefix="@"
- />
- <provider
- name="OleDb1.1"
- description="OleDb, provider V1.0.5000.0 in framework .NET V1.1"
- enabled="true"
- assemblyName="System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
- connectionClass="System.Data.OleDb.OleDbConnection"
- commandClass="System.Data.OleDb.OleDbCommand"
- parameterClass="System.Data.OleDb.OleDbParameter"
- parameterDbTypeClass="System.Data.OleDb.OleDbType"
- parameterDbTypeProperty="OleDbType"
- dataAdapterClass="System.Data.OleDb.OleDbDataAdapter"
- commandBuilderClass="System.Data.OleDb.OleDbCommandBuilder"
- usePositionalParameters = "true"
- useParameterPrefixInSql = "false"
- useParameterPrefixInParameter = "false"
- parameterPrefix = ""
- />
- <provider
- name="Odbc1.1"
- description="Odbc, provider V1.0.5000.0 in framework .NET V1.1"
- enabled="true"
- assemblyName="System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
- connectionClass="System.Data.Odbc.OdbcConnection"
- commandClass="System.Data.Odbc.OdbcCommand"
- parameterClass="System.Data.Odbc.OdbcParameter"
- parameterDbTypeClass="System.Data.Odbc.OdbcType"
- parameterDbTypeProperty="OdbcType"
- dataAdapterClass="System.Data.Odbc.OdbcDataAdapter"
- commandBuilderClass="System.Data.Odbc.OdbcCommandBuilder"
- usePositionalParameters = "true"
- useParameterPrefixInSql = "false"
- useParameterPrefixInParameter = "false"
- parameterPrefix = "@"
- />
- <provider
- name="oracle9.2"
- description="Oracle, Oracle provider V9.2.0.401"
- enabled="false"
- assemblyName="Oracle.DataAccess, Version=9.2.0.401, Culture=neutral, PublicKeyToken=89b483f429c47342"
- connectionClass="Oracle.DataAccess.Client.OracleConnection"
- commandClass="Oracle.DataAccess.Client.OracleCommand"
- parameterClass="Oracle.DataAccess.Client.OracleParameter"
- parameterDbTypeClass="Oracle.DataAccess.Client.OracleDbType"
- parameterDbTypeProperty="OracleDbType"
- dataAdapterClass="Oracle.DataAccess.Client.OracleDataAdapter"
- commandBuilderClass="Oracle.DataAccess.Client.OracleCommandBuilder"
- usePositionalParameters = "false"
- useParameterPrefixInSql = "true"
- useParameterPrefixInParameter = "false"
- parameterPrefix=":"
- useDeriveParameters="false"
- />
- <provider
- name="oracle10.1"
- description="Oracle, oracle provider V10.1.0.301"
- enabled="false"
- assemblyName="Oracle.DataAccess, Version=10.1.0.301, Culture=neutral, PublicKeyToken=89b483f429c47342"
- connectionClass="Oracle.DataAccess.Client.OracleConnection"
- commandClass="Oracle.DataAccess.Client.OracleCommand"
- parameterClass="Oracle.DataAccess.Client.OracleParameter"
- parameterDbTypeClass="Oracle.DataAccess.Client.OracleDbType"
- parameterDbTypeProperty="OracleDbType"
- dataAdapterClass="Oracle.DataAccess.Client.OracleDataAdapter"
- commandBuilderClass="Oracle.DataAccess.Client.OracleCommandBuilder"
- usePositionalParameters = "true"
- useParameterPrefixInSql = "true"
- useParameterPrefixInParameter = "true"
- parameterPrefix=":"
- useDeriveParameters="false"
- />
- <provider
- name="oracleClient1.0"
- description="Oracle, Microsoft provider V1.0.5000.0"
- enabled="false"
- default="false"
- assemblyName="System.Data.OracleClient, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
- connectionClass="System.Data.OracleClient.OracleConnection"
- commandClass="System.Data.OracleClient.OracleCommand"
- parameterClass="System.Data.OracleClient.OracleParameter"
- parameterDbTypeClass="System.Data.OracleClient.OracleType"
- parameterDbTypeProperty="OracleType"
- dataAdapterClass="System.Data.OracleClient.OracleDataAdapter"
- commandBuilderClass="System.Data.OracleClient.OracleCommandBuilder"
- usePositionalParameters = "false"
- useParameterPrefixInSql = "true"
- useParameterPrefixInParameter = "false"
- parameterPrefix=":"
- />
- <provider
- name="ByteFx"
- description="MySQL, ByteFx provider V0.7.6.15073"
- enabled="false"
- assemblyName="ByteFX.MySqlClient, Version=0.7.6.15073, Culture=neutral, PublicKeyToken=f2fef6fed1732fc1"
- connectionClass="ByteFX.Data.MySqlClient.MySqlConnection"
- commandClass="ByteFX.Data.MySqlClient.MySqlCommand"
- parameterClass="ByteFX.Data.MySqlClient.MySqlParameter"
- parameterDbTypeClass="ByteFX.Data.MySqlClient.MySqlDbType"
- parameterDbTypeProperty="MySqlDbType"
- dataAdapterClass="ByteFX.Data.MySqlClient.MySqlDataAdapter"
- commandBuilderClass="ByteFX.Data.MySqlClient.MySqlCommandBuilder"
- usePositionalParameters = "false"
- useParameterPrefixInSql = "true"
- useParameterPrefixInParameter = "true"
- parameterPrefix="@"
- />
- <provider
- name="MySql"
- description="MySQL, MySQL provider V1.0.4.20163"
- enabled="false"
- assemblyName="MySql.Data, Version=1.0.4.20163, Culture=neutral, PublicKeyToken=c5687fc88969c44d"
- connectionClass="MySql.Data.MySqlClient.MySqlConnection"
- commandClass="MySql.Data.MySqlClient.MySqlCommand"
- parameterClass="MySql.Data.MySqlClient.MySqlParameter"
- parameterDbTypeClass="MySql.Data.MySqlClient.MySqlDbType"
- parameterDbTypeProperty="MySqlDbType"
- dataAdapterClass="MySql.Data.MySqlClient.MySqlDataAdapter"
- commandBuilderClass="MySql.Data.MySqlClient.MySqlCommandBuilder"
- usePositionalParameters = "false"
- useParameterPrefixInSql = "true"
- useParameterPrefixInParameter = "true"
- parameterPrefix="@"
- />
- <provider
- name="SQLite3"
- description="SQLite, SQLite.NET provider V0.21.1869.3794"
- enabled="false"
- assemblyName="SQLite.NET, Version=0.21.1869.3794, Culture=neutral, PublicKeyToken=c273bd375e695f9c"
- connectionClass="Finisar.SQLite.SQLiteConnection"
- commandClass="Finisar.SQLite.SQLiteCommand"
- parameterClass="Finisar.SQLite.SQLiteParameter"
- parameterDbTypeClass="System.Data.DbType, System.Data"
- parameterDbTypeProperty="DbType"
- dataAdapterClass="Finisar.SQLite.SQLiteDataAdapter"
- commandBuilderClass="Finisar.SQLite.SQLiteCommandBuilder"
- usePositionalParameters = "true"
- useParameterPrefixInSql = "false"
- useParameterPrefixInParameter = "false"
- parameterPrefix=""
- setDbParameterPrecision="false"
- setDbParameterScale="false"
- setDbParameterSize="false"
- />
- <provider
- name="Firebird1.7"
- description="Firebird, Firebird SQL .NET provider V1.7.0.33200"
- enabled="false"
- assemblyName="FirebirdSql.Data.Firebird, Version=1.7.0.33200, Culture=neutral, PublicKeyToken=fa843d180294369d"
- connectionClass="FirebirdSql.Data.Firebird.FbConnection"
- commandClass="FirebirdSql.Data.Firebird.FbCommand"
- parameterClass="FirebirdSql.Data.Firebird.FbParameter"
- parameterDbTypeClass="FirebirdSql.Data.Firebird.FbDbType"
- parameterDbTypeProperty="FbDbType"
- dataAdapterClass="FirebirdSql.Data.Firebird.FbDataAdapter"
- commandBuilderClass="FirebirdSql.Data.Firebird.FbCommandBuilder"
- usePositionalParameters = "false"
- useParameterPrefixInSql = "true"
- useParameterPrefixInParameter = "true"
- parameterPrefix="@"
- />
- <provider
- name="PostgreSql0.7"
- description="PostgreSql, Npgsql provider V0.7.0.0"
- enabled="true"
- assemblyName="Npgsql, Version=0.7.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"
- connectionClass="Npgsql.NpgsqlConnection"
- commandClass="Npgsql.NpgsqlCommand"
- parameterClass="Npgsql.NpgsqlParameter"
- parameterDbTypeClass="NpgsqlTypes.NpgsqlDbType"
- parameterDbTypeProperty="NpgsqlDbType"
- dataAdapterClass="Npgsql.NpgsqlDataAdapter"
- commandBuilderClass="Npgsql.NpgsqlCommandBuilder"
- usePositionalParameters = "false"
- useParameterPrefixInSql = "true"
- useParameterPrefixInParameter = "true"
- parameterPrefix=":"
- />
- <provider
- name="iDb2.10"
- enabled="false"
- assemblyName="IBM.Data.DB2.iSeries, Version=10.0.0.0,Culture=neutral, PublicKeyToken=9cdb2ebfb1f93a26, Custom=null"
- connectionClass="IBM.Data.DB2.iSeries.iDB2Connection"
- commandClass="IBM.Data.DB2.iSeries.iDB2Command"
- parameterClass="IBM.Data.DB2.iSeries.iDB2Parameter"
- parameterDbTypeClass="IBM.Data.DB2.iSeries.iDB2DbType"
- parameterDbTypeProperty="iDB2DbType"
- dataAdapterClass="IBM.Data.DB2.iSeries.iDB2DataAdapter"
- commandBuilderClass="IBM.Data.DB2.iSeries.iDB2CommandBuilder"
- usePositionalParameters = "true"
- useParameterPrefixInSql = "false"
- useParameterPrefixInParameter = "false"
- parameterPrefix = ""
- />
+<?xml version="1.0" encoding="utf-8"?>
+<providers xmlns="http://ibatis.apache.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ibatis.apache.org
+http://ibatis.apache.org/xsd/providers.xsd">
+<clear/>
+<provider name="sqlServer1.0" description="Microsoft SQL Server 7.0/2000, provider V1.0.3300.0 in framework .NET V1.0" enabled="false" assemblyName="System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" connectionClass="System.Data.SqlClient.SqlConnection" commandClass="System.Data.SqlClient.SqlCommand" parameterClass="System.Data.SqlClient.SqlParameter" parameterDbTypeClass="System.Data.SqlDbType" parameterDbTypeProperty="SqlDbType" dataAdapterClass="System.Data.SqlClient.SqlDataAdapter" commandBuilderClass="System.Data.SqlClient.SqlCommandBuilder" usePositionalParameters="false" useParameterPrefixInSql="true" useParameterPrefixInParameter="true" parameterPrefix="@"/>
+<provider name="sqlServer1.1" description="Microsoft SQL Server 7.0/2000, provider V1.0.5000.0 in framework .NET V1.1" default="true" assemblyName="System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" connectionClass="System.Data.SqlClient.SqlConnection" commandClass="System.Data.SqlClient.SqlCommand" parameterClass="System.Data.SqlClient.SqlParameter" parameterDbTypeClass="System.Data.SqlDbType" parameterDbTypeProperty="SqlDbType" dataAdapterClass="System.Data.SqlClient.SqlDataAdapter" commandBuilderClass="System.Data.SqlClient.SqlCommandBuilder" usePositionalParameters="false" useParameterPrefixInSql="true" useParameterPrefixInParameter="true" parameterPrefix="@"/>
+<provider name="OleDb1.1" description="OleDb, provider V1.0.5000.0 in framework .NET V1.1" enabled="true" assemblyName="System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" connectionClass="System.Data.OleDb.OleDbConnection" commandClass="System.Data.OleDb.OleDbCommand" parameterClass="System.Data.OleDb.OleDbParameter" parameterDbTypeClass="System.Data.OleDb.OleDbType" parameterDbTypeProperty="OleDbType" dataAdapterClass="System.Data.OleDb.OleDbDataAdapter" commandBuilderClass="System.Data.OleDb.OleDbCommandBuilder" usePositionalParameters="true" useParameterPrefixInSql="false" useParameterPrefixInParameter="false" parameterPrefix=""/>
+<provider name="Odbc1.1" description="Odbc, provider V1.0.5000.0 in framework .NET V1.1" enabled="true" assemblyName="System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" connectionClass="System.Data.Odbc.OdbcConnection" commandClass="System.Data.Odbc.OdbcCommand" parameterClass="System.Data.Odbc.OdbcParameter" parameterDbTypeClass="System.Data.Odbc.OdbcType" parameterDbTypeProperty="OdbcType" dataAdapterClass="System.Data.Odbc.OdbcDataAdapter" commandBuilderClass="System.Data.Odbc.OdbcCommandBuilder" usePositionalParameters="true" useParameterPrefixInSql="false" useParameterPrefixInParameter="false" parameterPrefix="@"/>
+<provider name="oracle9.2" description="Oracle, Oracle provider V9.2.0.401" enabled="false" assemblyName="Oracle.DataAccess, Version=9.2.0.401, Culture=neutral, PublicKeyToken=89b483f429c47342" connectionClass="Oracle.DataAccess.Client.OracleConnection" commandClass="Oracle.DataAccess.Client.OracleCommand" parameterClass="Oracle.DataAccess.Client.OracleParameter" parameterDbTypeClass="Oracle.DataAccess.Client.OracleDbType" parameterDbTypeProperty="OracleDbType" dataAdapterClass="Oracle.DataAccess.Client.OracleDataAdapter" commandBuilderClass="Oracle.DataAccess.Client.OracleCommandBuilder" usePositionalParameters="false" useParameterPrefixInSql="true" useParameterPrefixInParameter="false" parameterPrefix=":" useDeriveParameters="false"/>
+<provider name="oracle10.1" description="Oracle, oracle provider V10.1.0.301" enabled="false" assemblyName="Oracle.DataAccess, Version=10.1.0.301, Culture=neutral, PublicKeyToken=89b483f429c47342" connectionClass="Oracle.DataAccess.Client.OracleConnection" commandClass="Oracle.DataAccess.Client.OracleCommand" parameterClass="Oracle.DataAccess.Client.OracleParameter" parameterDbTypeClass="Oracle.DataAccess.Client.OracleDbType" parameterDbTypeProperty="OracleDbType" dataAdapterClass="Oracle.DataAccess.Client.OracleDataAdapter" commandBuilderClass="Oracle.DataAccess.Client.OracleCommandBuilder" usePositionalParameters="true" useParameterPrefixInSql="true" useParameterPrefixInParameter="true" parameterPrefix=":" useDeriveParameters="false"/>
+<provider name="oracleClient1.0" description="Oracle, Microsoft provider V1.0.5000.0" enabled="false" default="false" assemblyName="System.Data.OracleClient, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" connectionClass="System.Data.OracleClient.OracleConnection" commandClass="System.Data.OracleClient.OracleCommand" parameterClass="System.Data.OracleClient.OracleParameter" parameterDbTypeClass="System.Data.OracleClient.OracleType" parameterDbTypeProperty="OracleType" dataAdapterClass="System.Data.OracleClient.OracleDataAdapter" commandBuilderClass="System.Data.OracleClient.OracleCommandBuilder" usePositionalParameters="false" useParameterPrefixInSql="true" useParameterPrefixInParameter="false" parameterPrefix=":"/>
+<provider name="ByteFx" description="MySQL, ByteFx provider V0.7.6.15073" enabled="true" assemblyName="ByteFX.MySqlClient, Version=0.7.6.15073, Culture=neutral, PublicKeyToken=f2fef6fed1732fc1" connectionClass="ByteFX.Data.MySqlClient.MySqlConnection" commandClass="ByteFX.Data.MySqlClient.MySqlCommand" parameterClass="ByteFX.Data.MySqlClient.MySqlParameter" parameterDbTypeClass="ByteFX.Data.MySqlClient.MySqlDbType" parameterDbTypeProperty="MySqlDbType" dataAdapterClass="ByteFX.Data.MySqlClient.MySqlDataAdapter" commandBuilderClass="ByteFX.Data.MySqlClient.MySqlCommandBuilder" usePositionalParameters="false" useParameterPrefixInSql="true" useParameterPrefixInParameter="true" parameterPrefix="@"/>
+<provider name="MySql" description="MySQL, MySQL provider V1.0.4.20163" enabled="false" assemblyName="MySql.Data, Version=1.0.4.20163, Culture=neutral, PublicKeyToken=c5687fc88969c44d" connectionClass="MySql.Data.MySqlClient.MySqlConnection" commandClass="MySql.Data.MySqlClient.MySqlCommand" parameterClass="MySql.Data.MySqlClient.MySqlParameter" parameterDbTypeClass="MySql.Data.MySqlClient.MySqlDbType" parameterDbTypeProperty="MySqlDbType" dataAdapterClass="MySql.Data.MySqlClient.MySqlDataAdapter" commandBuilderClass="MySql.Data.MySqlClient.MySqlCommandBuilder" usePositionalParameters="false" useParameterPrefixInSql="true" useParameterPrefixInParameter="true" parameterPrefix="@"/>
+<provider name="SQLite3" description="SQLite, SQLite.NET provider V0.21.1869.3794" enabled="false" assemblyName="SQLite.NET, Version=0.21.1869.3794, Culture=neutral, PublicKeyToken=c273bd375e695f9c" connectionClass="Finisar.SQLite.SQLiteConnection" commandClass="Finisar.SQLite.SQLiteCommand" parameterClass="Finisar.SQLite.SQLiteParameter" parameterDbTypeClass="System.Data.DbType, System.Data" parameterDbTypeProperty="DbType" dataAdapterClass="Finisar.SQLite.SQLiteDataAdapter" commandBuilderClass="Finisar.SQLite.SQLiteCommandBuilder" usePositionalParameters="true" useParameterPrefixInSql="false" useParameterPrefixInParameter="false" parameterPrefix="" setDbParameterPrecision="false" setDbParameterScale="false" setDbParameterSize="false"/>
+<provider name="Firebird1.7" description="Firebird, Firebird SQL .NET provider V1.7.0.33200" enabled="false" assemblyName="FirebirdSql.Data.Firebird, Version=1.7.0.33200, Culture=neutral, PublicKeyToken=fa843d180294369d" connectionClass="FirebirdSql.Data.Firebird.FbConnection" commandClass="FirebirdSql.Data.Firebird.FbCommand" parameterClass="FirebirdSql.Data.Firebird.FbParameter" parameterDbTypeClass="FirebirdSql.Data.Firebird.FbDbType" parameterDbTypeProperty="FbDbType" dataAdapterClass="FirebirdSql.Data.Firebird.FbDataAdapter" commandBuilderClass="FirebirdSql.Data.Firebird.FbCommandBuilder" usePositionalParameters="false" useParameterPrefixInSql="true" useParameterPrefixInParameter="true" parameterPrefix="@"/>
+<provider name="PostgreSql0.7" description="PostgreSql, Npgsql provider V0.7.0.0" enabled="true" assemblyName="Npgsql, Version=0.7.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7" connectionClass="Npgsql.NpgsqlConnection" commandClass="Npgsql.NpgsqlCommand" parameterClass="Npgsql.NpgsqlParameter" parameterDbTypeClass="NpgsqlTypes.NpgsqlDbType" parameterDbTypeProperty="NpgsqlDbType" dataAdapterClass="Npgsql.NpgsqlDataAdapter" commandBuilderClass="Npgsql.NpgsqlCommandBuilder" usePositionalParameters="false" useParameterPrefixInSql="true" useParameterPrefixInParameter="true" parameterPrefix=":"/>
+<provider name="iDb2.10" enabled="false" assemblyName="IBM.Data.DB2.iSeries, Version=10.0.0.0,Culture=neutral, PublicKeyToken=9cdb2ebfb1f93a26, Custom=null" connectionClass="IBM.Data.DB2.iSeries.iDB2Connection" commandClass="IBM.Data.DB2.iSeries.iDB2Command" parameterClass="IBM.Data.DB2.iSeries.iDB2Parameter" parameterDbTypeClass="IBM.Data.DB2.iSeries.iDB2DbType" parameterDbTypeProperty="iDB2DbType" dataAdapterClass="IBM.Data.DB2.iSeries.iDB2DataAdapter" commandBuilderClass="IBM.Data.DB2.iSeries.iDB2CommandBuilder" usePositionalParameters="true" useParameterPrefixInSql="false" useParameterPrefixInParameter="false" parameterPrefix=""/>
</providers>
-
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Alias/TypeAlias.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Alias/TypeAlias.cs?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Alias/TypeAlias.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Alias/TypeAlias.cs Sat Jul 9 07:40:43 2005
@@ -38,7 +38,7 @@
/// TypeAlias.
/// </summary>
[Serializable]
- [XmlRoot("typeAlias")]
+ [XmlRoot("typeAlias", Namespace="http://ibatis.apache.org")]
public class TypeAlias
{
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Alias/TypeHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Alias/TypeHandler.cs?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Alias/TypeHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Alias/TypeHandler.cs Sat Jul 9 07:40:43 2005
@@ -38,7 +38,7 @@
/// Summary description for TypeHandler.
/// </summary>
[Serializable]
- [XmlRoot("typeHandler")]
+ [XmlRoot("typeHandler", Namespace="http://ibatis.apache.org")]
public class TypeHandler
{
#region Fields
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Cache/CacheModel.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Cache/CacheModel.cs?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Cache/CacheModel.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/Cache/CacheModel.cs Sat Jul 9 07:40:43 2005
@@ -44,7 +44,7 @@
/// Summary description for CacheModel.
/// </summary>
[Serializable]
- [XmlRoot("cacheModel")]
+ [XmlRoot("cacheModel", Namespace="http://ibatis.apache.org")]
public class CacheModel
{
#region Fields
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs Sat Jul 9 07:40:43 2005
@@ -81,6 +81,12 @@
private const string PROPERTY_ELEMENT_VALUE_ATTRIB = "value";
/// <summary>
+ ///
+ /// </summary>
+ public const string XML_NAMESPACE_PREFIX = "ib";
+ private const string IBATIS_XML_NAMESPACE = "http://ibatis.apache.org";
+
+ /// <summary>
/// Default congig name
/// </summary>
public const string DEFAULT_FILE_CONFIG_NAME = "sqlmap.config";
@@ -98,12 +104,12 @@
/// <summary>
/// Token for SqlMapConfig xml root.
/// </summary>
- private const string XML_CONFIG_ROOT = "sqlMapConfig";
+ private const string XML_DATAMAPPER_CONFIG_ROOT = "sqlMapConfig";
/// <summary>
/// Token for xml path to SqlMapConfig settings element.
/// </summary>
- private const string XML_CONFIG_SETTINGS = "/sqlMapConfig/settings/setting";
+ private const string XML_CONFIG_SETTINGS = "sqlMapConfig/settings/setting";
/// <summary>
/// Token for providers config file name.
@@ -113,14 +119,137 @@
/// <summary>
/// Token for xml path to SqlMapConfig providers element.
/// </summary>
- private static string XML_CONFIG_PROVIDERS = "/sqlMapConfig/providers";
+ private const string XML_CONFIG_PROVIDERS = "sqlMapConfig/providers";
+
+ /// <summary>
+ /// Token for xml path to properties elements.
+ /// </summary>
+ private const string XML_PROPERTIES = "properties";
+
+ /// <summary>
+ /// Token for xml path to property elements.
+ /// </summary>
+ private const string XML_PROPERTY = "property";
+
+ /// <summary>
+ /// Token for xml path to settings add elements.
+ /// </summary>
+ private const string XML_SETTINGS_ADD = "/settings/add";
/// <summary>
/// Token for xml path to global properties elements.
/// </summary>
- private static string XML_GLOBAL_PROPERTIES = "/settings/add";
+ private const string XML_GLOBAL_PROPERTIES = "settings/add";
+
+ /// <summary>
+ /// Token for xml path to provider elements.
+ /// </summary>
+ private const string XML_PROVIDER = "providers/provider";
+
+ /// <summary>
+ /// Token for xml path to database provider elements.
+ /// </summary>
+ private const string XML_DATABASE_PROVIDER = "sqlMapConfig/database/provider";
+
+ /// <summary>
+ /// Token for xml path to database source elements.
+ /// </summary>
+ private const string XML_DATABASE_DATASOURCE = "sqlMapConfig/database/dataSource";
+
+ /// <summary>
+ /// Token for xml path to global type alias elements.
+ /// </summary>
+ private const string XML_GLOBAL_TYPEALIAS = "sqlMapConfig/alias/typeAlias";
+
+ /// <summary>
+ /// Token for xml path to global type alias elements.
+ /// </summary>
+ private const string XML_GLOBAL_TYPEHANDLER = "sqlMapConfig/typeHandlers/typeHandler";
+
+ /// <summary>
+ /// Token for xml path to sqlMap elements.
+ /// </summary>
+ private const string XML_SQLMAP = "sqlMapConfig/sqlMaps/sqlMap";
+
+ /// <summary>
+ /// Token for mapping xml root.
+ /// </summary>
+ private const string XML_MAPPING_ROOT = "sqlMap";
- // TODO: Other XML paths.
+ /// <summary>
+ /// Token for xml path to type alias elements.
+ /// </summary>
+ private const string XML_TYPEALIAS = "sqlMap/alias/typeAlias";
+
+ /// <summary>
+ /// Token for xml path to resultMap elements.
+ /// </summary>
+ private const string XML_RESULTMAP = "sqlMap/resultMaps/resultMap";
+
+ /// <summary>
+ /// Token for xml path to parameterMap elements.
+ /// </summary>
+ private const string XML_PARAMETERMAP = "sqlMap/parameterMaps/parameterMap";
+
+ /// <summary>
+ /// Token for xml path to statement elements.
+ /// </summary>
+ private const string XML_STATEMENT = "sqlMap/statements/statement";
+
+ /// <summary>
+ /// Token for xml path to select elements.
+ /// </summary>
+ private const string XML_SELECT = "sqlMap/statements/select";
+
+ /// <summary>
+ /// Token for xml path to insert elements.
+ /// </summary>
+ private const string XML_INSERT = "sqlMap/statements/insert";
+
+ /// <summary>
+ /// Token for xml path to selectKey elements.
+ /// </summary>
+ private const string XML_SELECTKEY= "selectKey";
+
+ /// <summary>
+ /// Token for xml path to update elements.
+ /// </summary>
+ private const string XML_UPDATE ="sqlMap/statements/update";
+
+ /// <summary>
+ /// Token for xml path to delete elements.
+ /// </summary>
+ private const string XML_DELETE ="sqlMap/statements/delete";
+
+ /// <summary>
+ /// Token for xml path to procedure elements.
+ /// </summary>
+ private const string XML_PROCEDURE ="sqlMap/statements/procedure";
+
+ /// <summary>
+ /// Token for xml path to cacheModel elements.
+ /// </summary>
+ private const string XML_CACHE_MODEL = "sqlMap/cacheModels/cacheModel";
+
+ /// <summary>
+ /// Token for xml path to flushOnExecute elements.
+ /// </summary>
+ private const string XML_FLUSH_ON_EXECUTE = "flushOnExecute";
+
+ /// <summary>
+ /// Token for xml path to search statement elements.
+ /// </summary>
+ private const string XML_SEARCH_STATEMENT ="sqlMap/statements";
+
+ /// <summary>
+ /// Token for xml path to search parameterMap elements.
+ /// </summary>
+ private const string XML_SEARCH_PARAMETER ="sqlMap/parameterMaps/parameterMap[@id='";
+
+ /// <summary>
+ /// Token for xml path to search resultMap elements.
+ /// </summary>
+ private const string XML_SEARCH_RESULTMAP ="sqlMap/resultMaps/resultMap[@id='";
/// <summary>
/// Token for useStatementNamespaces attribute.
@@ -130,15 +259,12 @@
/// Token for cacheModelsEnabled attribute.
/// </summary>
private const string ATR_CACHE_MODELS_ENABLED = "cacheModelsEnabled";
+
/// <summary>
/// Token for validateSqlMap attribute.
/// </summary>
private const string ATR_VALIDATE_SQLMAP = "validateSqlMap";
/// <summary>
- /// Token for validateSqlMapConfig attribute.
- /// </summary>
- private const string ATR_VALIDATE_SQLMAP_CONFIG = "validateSqlMapConfig";
- /// <summary>
/// Token for embedStatementParams attribute.
/// </summary>
private const string ATR_EMBED_STATEMENT_PARAMS = "useEmbedStatementParams";
@@ -367,8 +493,7 @@
/// <param name="useConfigFileWatcher"></param>
/// <param name="isCallFromDao"></param>
/// <returns>return an a SqlMapper instance</returns>
- private SqlMapper Build(XmlDocument document,
- DataSource dataSource,
+ private SqlMapper Build(XmlDocument document,DataSource dataSource,
bool useConfigFileWatcher, bool isCallFromDao)
{
_configScope.SqlMapConfigDocument = document;
@@ -376,6 +501,9 @@
_configScope.IsCallFromDao = isCallFromDao;
_configScope.UseConfigFileWatcher = useConfigFileWatcher;
+ _configScope.XmlNamespaceManager = new XmlNamespaceManager(_configScope.SqlMapConfigDocument.NameTable);
+ _configScope.XmlNamespaceManager.AddNamespace(XML_NAMESPACE_PREFIX, IBATIS_XML_NAMESPACE);
+
try
{
if (_configScope.ValidateSqlMapConfig)
@@ -494,7 +622,8 @@
#region Load Global Properties
if (_configScope.IsCallFromDao == false)
{
- _configScope.NodeContext = _configScope.SqlMapConfigDocument.SelectSingleNode(XML_CONFIG_ROOT);
+ _configScope.NodeContext = _configScope.SqlMapConfigDocument.SelectSingleNode( ApplyNamespacePrefix(XML_DATAMAPPER_CONFIG_ROOT), _configScope.XmlNamespaceManager);
+
ParseGlobalProperties();
}
#endregion
@@ -503,7 +632,8 @@
_configScope.ErrorContext.Activity = "loading global settings";
- XmlNodeList settings = _configScope.SqlMapConfigDocument.SelectNodes(XML_CONFIG_SETTINGS);
+ XmlNodeList settings = _configScope.SqlMapConfigDocument.SelectNodes( ApplyNamespacePrefix(XML_CONFIG_SETTINGS), _configScope.XmlNamespaceManager);
+ //XML_CONFIG_SETTINGS);
if (settings!=null)
{
@@ -558,7 +688,8 @@
#region Load the DataSources
_configScope.ErrorContext.Activity = "loading Database DataSource";
- XmlNode nodeDataSource = _configScope.SqlMapConfigDocument.SelectSingleNode("/sqlMapConfig/database/dataSource");
+ XmlNode nodeDataSource = _configScope.SqlMapConfigDocument.SelectSingleNode( ApplyNamespacePrefix(XML_DATABASE_DATASOURCE), _configScope.XmlNamespaceManager );
+
if (nodeDataSource == null)
{
if (_configScope.IsCallFromDao == false)
@@ -597,7 +728,7 @@
#endregion
#region Load Global TypeAlias
- foreach (XmlNode xmlNode in _configScope.SqlMapConfigDocument.SelectNodes("/sqlMapConfig/alias/typeAlias"))
+ foreach (XmlNode xmlNode in _configScope.SqlMapConfigDocument.SelectNodes( ApplyNamespacePrefix(XML_GLOBAL_TYPEALIAS), _configScope.XmlNamespaceManager))
{
_configScope.ErrorContext.Activity = "loading global Type alias";
TypeAlias typeAlias = null;
@@ -614,7 +745,7 @@
#endregion
#region Load TypeHandlers
- foreach (XmlNode xmlNode in _configScope.SqlMapConfigDocument.SelectNodes("/sqlMapConfig/typeHandlers/typeHandler"))
+ foreach (XmlNode xmlNode in _configScope.SqlMapConfigDocument.SelectNodes( ApplyNamespacePrefix(XML_GLOBAL_TYPEHANDLER), _configScope.XmlNamespaceManager))
{
try
{
@@ -627,7 +758,6 @@
_configScope.ErrorContext.MoreInfo = "initialize typeHandler";
handler.Initialize();
-
_configScope.ErrorContext.MoreInfo = "Check the callback attribute '" + handler.CallBackName + "' (must be a classname).";
ITypeHandler typeHandler = null;
Type type = _configScope.SqlMapper.GetType(handler.CallBackName);
@@ -670,7 +800,7 @@
#region Load sqlMap mapping files
- foreach (XmlNode xmlNode in _configScope.SqlMapConfigDocument.SelectNodes("/sqlMapConfig/sqlMaps/sqlMap"))
+ foreach (XmlNode xmlNode in _configScope.SqlMapConfigDocument.SelectNodes( ApplyNamespacePrefix(XML_SQLMAP), _configScope.XmlNamespaceManager))
{
_configScope.NodeContext = xmlNode;
ConfigureSqlMap();
@@ -737,7 +867,8 @@
_configScope.ErrorContext.Activity = "loading Providers";
XmlNode providersNode = null;
- providersNode = _configScope.SqlMapConfigDocument.SelectSingleNode(XML_CONFIG_PROVIDERS);
+ providersNode = _configScope.SqlMapConfigDocument.SelectSingleNode( ApplyNamespacePrefix(XML_CONFIG_PROVIDERS), _configScope.XmlNamespaceManager);
+
if (providersNode != null )
{
xmlProviders = Resources.GetAsXmlDocument( providersNode, _configScope.Properties );
@@ -749,7 +880,7 @@
serializer = new XmlSerializer(typeof(Provider));
- foreach (XmlNode node in xmlProviders.SelectNodes("/providers/provider"))
+ foreach (XmlNode node in xmlProviders.SelectNodes( ApplyNamespacePrefix(XML_PROVIDER), _configScope.XmlNamespaceManager ) )
{
_configScope.ErrorContext.Resource = node.InnerXml.ToString();
@@ -788,7 +919,7 @@
private Provider ParseProvider()
{
_configScope.ErrorContext.Activity = "load DataBase Provider";
- XmlNode node = _configScope.SqlMapConfigDocument.SelectSingleNode("//database/provider");
+ XmlNode node = _configScope.SqlMapConfigDocument.SelectSingleNode( ApplyNamespacePrefix(XML_DATABASE_PROVIDER), _configScope.XmlNamespaceManager );
if (node != null)
{
@@ -851,11 +982,11 @@
ValidateSchema( _configScope.SqlMapDocument.ChildNodes[1], "SqlMap.xsd" );
}
- _configScope.SqlMapNamespace = _configScope.SqlMapDocument.SelectSingleNode("sqlMap").Attributes["namespace"].Value;
+ _configScope.SqlMapNamespace = _configScope.SqlMapDocument.SelectSingleNode( ApplyNamespacePrefix(XML_MAPPING_ROOT), _configScope.XmlNamespaceManager ).Attributes["namespace"].Value;
#region Load TypeAlias
- foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes("/sqlMap/alias/typeAlias"))
+ foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes( ApplyNamespacePrefix(XML_TYPEALIAS), _configScope.XmlNamespaceManager))
{
_configScope.ErrorContext.MoreInfo = "loading type alias";
TypeAlias typeAlias = null;
@@ -874,7 +1005,7 @@
#region Load resultMap
- foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes("/sqlMap/resultMaps/resultMap"))
+ foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes( ApplyNamespacePrefix(XML_RESULTMAP), _configScope.XmlNamespaceManager))
{
_configScope.ErrorContext.MoreInfo = "loading ResultMap tag";
_configScope.NodeContext = xmlNode; // A ResultMap node
@@ -886,7 +1017,7 @@
#region Load parameterMaps
- foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes("/sqlMap/parameterMaps/parameterMap"))
+ foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes( ApplyNamespacePrefix(XML_PARAMETERMAP), _configScope.XmlNamespaceManager))
{
_configScope.ErrorContext.MoreInfo = "loading ParameterMap tag";
_configScope.NodeContext = xmlNode; // A ParameterMap node
@@ -901,7 +1032,7 @@
#region Statement tag
Statement statement = null;
serializer = new XmlSerializer(typeof(Statement));
- foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes("/sqlMap/statements/statement"))
+ foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes( ApplyNamespacePrefix(XML_STATEMENT), _configScope.XmlNamespaceManager))
{
_configScope.ErrorContext.MoreInfo = "loading statement tag";
_configScope.NodeContext = xmlNode; // A statement tag
@@ -922,7 +1053,6 @@
// Build ISql (analyse sql statement)
ProcessSqlStatement( statement );
- //config, sqlMapName, sqlMap, xmlNode, statement);
// Build MappedStatement
mappedStatement = new MappedStatement( _configScope.SqlMapper, statement);
@@ -934,7 +1064,7 @@
#region Select tag
Select select = null;
serializer = new XmlSerializer(typeof(Select));
- foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes("/sqlMap/statements/select"))
+ foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes( ApplyNamespacePrefix(XML_SELECT), _configScope.XmlNamespaceManager))
{
_configScope.ErrorContext.MoreInfo = "loading select tag";
_configScope.NodeContext = xmlNode; // A select node
@@ -962,7 +1092,6 @@
{
// Build ISql (analyse sql statement)
ProcessSqlStatement( select);
- //config, sqlMapName, sqlMap, xmlNode, select);
}
// Build MappedStatement
@@ -975,7 +1104,7 @@
#region Insert tag
Insert insert = null;
serializer = new XmlSerializer(typeof(Insert));
- foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes("/sqlMap/statements/insert"))
+ foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes( ApplyNamespacePrefix(XML_INSERT), _configScope.XmlNamespaceManager))
{
_configScope.ErrorContext.MoreInfo = "loading insert tag";
_configScope.NodeContext = xmlNode; // A insert tag
@@ -1002,7 +1131,6 @@
else
{
ProcessSqlStatement( insert);
- //config, sqlMapName, sqlMap, xmlNode, insert);
}
// Build MappedStatement
@@ -1016,7 +1144,7 @@
{
insert.SelectKey.Initialize( _configScope );
insert.SelectKey.Id = insert.Id + DOT + "SelectKey";
- string commandText = xmlNode.SelectSingleNode("selectKey").FirstChild.InnerText.Replace('\n', ' ').Replace('\r', ' ').Replace('\t', ' ').Trim();
+ string commandText = xmlNode.SelectSingleNode( ApplyNamespacePrefix(XML_SELECTKEY), _configScope.XmlNamespaceManager).FirstChild.InnerText.Replace('\n', ' ').Replace('\r', ' ').Replace('\t', ' ').Trim();
commandText = Resources.ParsePropertyTokens(commandText, _configScope.Properties);
StaticSql sql = new StaticSql(insert.SelectKey);
IDalSession session = new SqlMapSession( _configScope.SqlMapper.DataSource );
@@ -1035,7 +1163,7 @@
#region Update tag
Update update = null;
serializer = new XmlSerializer(typeof(Update));
- foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes("/sqlMap/statements/update"))
+ foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes( ApplyNamespacePrefix(XML_UPDATE), _configScope.XmlNamespaceManager))
{
_configScope.ErrorContext.MoreInfo = "loading update tag";
_configScope.NodeContext = xmlNode; // A update tag
@@ -1063,7 +1191,6 @@
{
// Build ISql (analyse sql statement)
ProcessSqlStatement(update);
- //config, sqlMapName, sqlMap, xmlNode, update);
}
// Build MappedStatement
@@ -1076,7 +1203,7 @@
#region Delete tag
Delete delete = null;
serializer = new XmlSerializer(typeof(Delete));
- foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes("/sqlMap/statements/delete"))
+ foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes( ApplyNamespacePrefix(XML_DELETE), _configScope.XmlNamespaceManager))
{
_configScope.ErrorContext.MoreInfo = "loading delete tag";
_configScope.NodeContext = xmlNode; // A delete tag
@@ -1103,7 +1230,6 @@
{
// Build ISql (analyse sql statement)
ProcessSqlStatement(delete);
- //config, sqlMapName, sqlMap, xmlNode, delete);
}
// Build MappedStatement
@@ -1116,7 +1242,7 @@
#region Procedure tag
Procedure procedure = null;
serializer = new XmlSerializer(typeof(Procedure));
- foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes("/sqlMap/statements/procedure"))
+ foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes( ApplyNamespacePrefix(XML_PROCEDURE), _configScope.XmlNamespaceManager))
{
_configScope.ErrorContext.MoreInfo = "loading procedure tag";
_configScope.NodeContext = xmlNode; // A procedure tag
@@ -1154,13 +1280,13 @@
{
CacheModel cacheModel = null;
serializer = new XmlSerializer(typeof(CacheModel));
- foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes("/sqlMap/cacheModels/cacheModel"))
+ foreach (XmlNode xmlNode in _configScope.SqlMapDocument.SelectNodes( ApplyNamespacePrefix(XML_CACHE_MODEL), _configScope.XmlNamespaceManager))
{
cacheModel = (CacheModel) serializer.Deserialize(new XmlNodeReader(xmlNode));
cacheModel.Id = ApplyNamespace( cacheModel.Id );
// Attach ExecuteEventHandler
- foreach(XmlNode flushOn in xmlNode.SelectNodes("flushOnExecute"))
+ foreach(XmlNode flushOn in xmlNode.SelectNodes( ApplyNamespacePrefix(XML_FLUSH_ON_EXECUTE), _configScope.XmlNamespaceManager ))
{
string statementName = flushOn.Attributes["statement"].Value;
if (_configScope.UseStatementNamespaces == true)
@@ -1174,7 +1300,7 @@
}
// Get Properties
- foreach(XmlNode propertie in xmlNode.SelectNodes("property"))
+ foreach(XmlNode propertie in xmlNode.SelectNodes( ApplyNamespacePrefix(XML_PROPERTY), _configScope.XmlNamespaceManager))
{
string name = propertie.Attributes["name"].Value;
string value = propertie.Attributes["value"].Value;
@@ -1211,7 +1337,7 @@
if (statement.ExtendSatement.Length >0)
{
// Find 'super' statement
- XmlNode supperStatementNode = _configScope.SqlMapDocument.SelectSingleNode("/sqlMap/statements/child::*[@id='"+statement.ExtendSatement+"']");
+ XmlNode supperStatementNode = _configScope.SqlMapDocument.SelectSingleNode( ApplyNamespacePrefix(XML_SEARCH_STATEMENT)+"/child::*[@id='"+statement.ExtendSatement+"']",_configScope.XmlNamespaceManager );
if (supperStatementNode!=null)
{
commandTextNode.InnerXml = supperStatementNode.InnerXml + commandTextNode.InnerXml;
@@ -1370,14 +1496,14 @@
/// </summary>
private void ParseGlobalProperties()
{
- XmlNode nodeProperties = _configScope.NodeContext.SelectSingleNode("properties");
+ XmlNode nodeProperties = _configScope.NodeContext.SelectSingleNode( ApplyNamespacePrefix(XML_PROPERTIES), _configScope.XmlNamespaceManager);
_configScope.ErrorContext.Activity = "loading global properties";
if (nodeProperties != null)
{
if (nodeProperties.HasChildNodes)
{
- foreach (XmlNode propertyNode in nodeProperties.SelectNodes("property"))
+ foreach (XmlNode propertyNode in nodeProperties.SelectNodes( ApplyNamespacePrefix(XML_PROPERTY), _configScope.XmlNamespaceManager))
{
XmlAttribute keyAttrib = propertyNode.Attributes[PROPERTY_ELEMENT_KEY_ATTRIB];
XmlAttribute valueAttrib = propertyNode.Attributes[PROPERTY_ELEMENT_VALUE_ATTRIB];
@@ -1392,7 +1518,7 @@
// Load the file defined by the attribute
XmlDocument propertiesConfig = Resources.GetAsXmlDocument(propertyNode, _configScope.Properties);
- foreach (XmlNode node in propertiesConfig.SelectNodes(XML_GLOBAL_PROPERTIES))
+ foreach (XmlNode node in propertiesConfig.SelectNodes( ApplyNamespacePrefix(XML_GLOBAL_PROPERTIES), _configScope.XmlNamespaceManager))
{
_configScope.Properties[node.Attributes[PROPERTY_ELEMENT_KEY_ATTRIB].Value] = node.Attributes[PROPERTY_ELEMENT_VALUE_ATTRIB].Value;
_logger.Info( string.Format("Add property \"{0}\" value \"{1}\"",node.Attributes[PROPERTY_ELEMENT_KEY_ATTRIB].Value,node.Attributes[PROPERTY_ELEMENT_VALUE_ATTRIB].Value) );
@@ -1411,7 +1537,7 @@
// Load the file defined by the attribute
XmlDocument propertiesConfig = Resources.GetAsXmlDocument(nodeProperties, _configScope.Properties);
- foreach (XmlNode node in propertiesConfig.SelectNodes("/settings/add"))
+ foreach (XmlNode node in propertiesConfig.SelectNodes( XML_SETTINGS_ADD ) )
{
_configScope.Properties[node.Attributes[PROPERTY_ELEMENT_KEY_ATTRIB].Value] = node.Attributes[PROPERTY_ELEMENT_VALUE_ATTRIB].Value;
_logger.Info( string.Format("Add property \"{0}\" value \"{1}\"",node.Attributes[PROPERTY_ELEMENT_KEY_ATTRIB].Value,node.Attributes[PROPERTY_ELEMENT_VALUE_ATTRIB].Value) );
@@ -1478,7 +1604,7 @@
// Did we already build Extend ParameterMap ?
if (_configScope.SqlMapper.ParameterMaps.Contains( parameterMap.ExtendMap ) == false)
{
- XmlNode superNode = _configScope.SqlMapConfigDocument.SelectSingleNode("/sqlMap/parameterMaps/parameterMap[@id='"+ attributeExtendMap +"']");
+ XmlNode superNode = _configScope.SqlMapConfigDocument.SelectSingleNode(ApplyNamespacePrefix(XML_SEARCH_PARAMETER)+ attributeExtendMap +"']", _configScope.XmlNamespaceManager );
if (superNode != null)
{
@@ -1545,7 +1671,7 @@
// Did we already build Extend ResultMap?
if (_configScope.SqlMapper.ResultMaps.Contains( resultMap.ExtendMap ) == false)
{
- XmlNode superNode = _configScope.SqlMapDocument.SelectSingleNode("/sqlMap/resultMaps/resultMap[@id='"+ attributeExtendMap +"']");
+ XmlNode superNode = _configScope.SqlMapDocument.SelectSingleNode( ApplyNamespacePrefix(XML_SEARCH_RESULTMAP)+ attributeExtendMap +"']", _configScope.XmlNamespaceManager);
if (superNode != null)
{
@@ -1606,6 +1732,17 @@
return Assembly.GetExecutingAssembly().GetManifestResourceStream("IBatisNet.DataMapper." + schemaResourceKey);
}
+
+ /// <summary>
+ /// Apply an XML NameSpace
+ /// </summary>
+ /// <param name="elementName"></param>
+ /// <returns></returns>
+ public static string ApplyNamespacePrefix( string elementName )
+ {
+ return XML_NAMESPACE_PREFIX+ ":" + elementName.
+ Replace("/","/"+XML_NAMESPACE_PREFIX+":");
+ }
// private String ParsePropertyTokens(string str)
// {
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ParameterMapping/ParameterMap.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ParameterMapping/ParameterMap.cs?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ParameterMapping/ParameterMap.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ParameterMapping/ParameterMap.cs Sat Jul 9 07:40:43 2005
@@ -43,10 +43,15 @@
/// Summary description for ParameterMap.
/// </summary>
[Serializable]
- [XmlRoot("parameterMap")]
+ [XmlRoot("parameterMap", Namespace="http://ibatis.apache.org")]
public class ParameterMap
{
+ /// <summary>
+ /// Token for xml path to parameter elements.
+ /// </summary>
+ private const string XML_PARAMATER = "parameter";
+
#region private
[NonSerialized]
private string _id = string.Empty;
@@ -321,7 +326,7 @@
ParameterProperty property = null;
serializer = new XmlSerializer(typeof(ParameterProperty));
- foreach ( XmlNode parameterNode in configScope.NodeContext.SelectNodes("parameter") )
+ foreach ( XmlNode parameterNode in configScope.NodeContext.SelectNodes(DomSqlMapBuilder.ApplyNamespacePrefix(XML_PARAMATER), configScope.XmlNamespaceManager) )
{
property = (ParameterProperty) serializer.Deserialize(new XmlNodeReader(parameterNode));
property.Initialize( configScope );
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ParameterMapping/ParameterProperty.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ParameterMapping/ParameterProperty.cs?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ParameterMapping/ParameterProperty.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ParameterMapping/ParameterProperty.cs Sat Jul 9 07:40:43 2005
@@ -43,7 +43,7 @@
/// Summary description for ParameterProperty.
/// </summary>
[Serializable]
- [XmlRoot("parameter")]
+ [XmlRoot("parameter", Namespace="http://ibatis.apache.org")]
public class ParameterProperty
{
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ResultMapping/Discriminator.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ResultMapping/Discriminator.cs?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ResultMapping/Discriminator.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ResultMapping/Discriminator.cs Sat Jul 9 07:40:43 2005
@@ -40,7 +40,7 @@
/// Summary description for Discriminator.
/// </summary>
[Serializable]
- [XmlRoot("discriminator")]
+ [XmlRoot("discriminator", Namespace="http://ibatis.apache.org")]
public class Discriminator
{
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ResultMapping/ResultMap.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ResultMapping/ResultMap.cs?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ResultMapping/ResultMap.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ResultMapping/ResultMap.cs Sat Jul 9 07:40:43 2005
@@ -45,9 +45,24 @@
/// Summary description for ResultMap.
/// </summary>
[Serializable]
- [XmlRoot("resultMap")]
+ [XmlRoot("resultMap", Namespace="http://ibatis.apache.org")]
public class ResultMap
{
+ /// <summary>
+ /// Token for xml path to result elements.
+ /// </summary>
+ private const string XML_RESULT = "result";
+
+ /// <summary>
+ /// Token for xml path to discriminator elements.
+ /// </summary>
+ private const string XML_DISCRIMNATOR = "discriminator";
+
+ /// <summary>
+ /// Token for xml path to subMap elements.
+ /// </summary>
+ private const string XML_SUBMAP = "subMap";
+
#region Fields
[NonSerialized]
private string _id = string.Empty;
@@ -211,7 +226,7 @@
#region Load the Result Properties
serializer = new XmlSerializer(typeof(ResultProperty));
- foreach ( XmlNode resultNode in configScope.NodeContext.SelectNodes("result") )
+ foreach ( XmlNode resultNode in configScope.NodeContext.SelectNodes( DomSqlMapBuilder.ApplyNamespacePrefix(XML_RESULT), configScope.XmlNamespaceManager) )
{
mapping = (ResultProperty) serializer.Deserialize(new XmlNodeReader(resultNode));
@@ -232,7 +247,7 @@
#region Load the Discriminator Property
serializer = new XmlSerializer(typeof(Discriminator));
- XmlNode discriminatorNode = configScope.NodeContext.SelectSingleNode("discriminator");
+ XmlNode discriminatorNode = configScope.NodeContext.SelectSingleNode(DomSqlMapBuilder.ApplyNamespacePrefix(XML_DISCRIMNATOR), configScope.XmlNamespaceManager);
if (discriminatorNode != null)
{
configScope.ErrorContext.MoreInfo = "initialize discriminator";
@@ -246,11 +261,11 @@
#region Load the SubMap Properties
serializer = new XmlSerializer(typeof(SubMap));
- if (configScope.NodeContext.SelectNodes("subMap").Count>0 && this.Discriminator==null)
+ if (configScope.NodeContext.SelectNodes(DomSqlMapBuilder.ApplyNamespacePrefix(XML_SUBMAP), configScope.XmlNamespaceManager).Count>0 && this.Discriminator==null)
{
throw new ConfigurationException("The discriminator is null, but somehow a subMap was reached. This is a bug.");
}
- foreach ( XmlNode resultNode in configScope.NodeContext.SelectNodes("subMap") )
+ foreach ( XmlNode resultNode in configScope.NodeContext.SelectNodes(DomSqlMapBuilder.ApplyNamespacePrefix(XML_SUBMAP), configScope.XmlNamespaceManager) )
{
configScope.ErrorContext.MoreInfo = "initialize subMap";
subMap = (SubMap) serializer.Deserialize(new XmlNodeReader(resultNode));
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ResultMapping/ResultProperty.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ResultMapping/ResultProperty.cs?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ResultMapping/ResultProperty.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ResultMapping/ResultProperty.cs Sat Jul 9 07:40:43 2005
@@ -44,7 +44,7 @@
/// Summary description for ResultProperty.
/// </summary>
[Serializable]
- [XmlRoot("result")]
+ [XmlRoot("result", Namespace="http://ibatis.apache.org")]
public class ResultProperty
{
#region Const
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ResultMapping/SubMap.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ResultMapping/SubMap.cs?rev=209946&r1=209945&r2=209946&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ResultMapping/SubMap.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/ResultMapping/SubMap.cs Sat Jul 9 07:40:43 2005
@@ -37,7 +37,7 @@
/// Summary description for SubMap.
/// </summary>
[Serializable]
- [XmlRoot("subMap")]
+ [XmlRoot("subMap", Namespace="http://ibatis.apache.org")]
public class SubMap
{
// <resultMap id="document" class="Document">