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/10 15:06:41 UTC
svn commit: r210008 [2/2] - in /ibatis/trunk/cs/mapper: IBatisNet.Common/
IBatisNet.DataAccess.Test/Maps/Access/OleDb/
IBatisNet.DataAccess.Test/Maps/MSSQL/Odbc/
IBatisNet.DataAccess.Test/Maps/MSSQL/OleDb/
IBatisNet.DataAccess.Test/Maps/MSSQL/SqlClient...
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess/Configuration/DomDaoManagerBuilder.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/Configuration/DomDaoManagerBuilder.cs?rev=210008&r1=210007&r2=210008&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess/Configuration/DomDaoManagerBuilder.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess/Configuration/DomDaoManagerBuilder.cs Sun Jul 10 06:06:38 2005
@@ -53,8 +53,10 @@
/// <summary>
///
/// </summary>
- public const string XML_NAMESPACE_PREFIX = "ib";
- private const string IBATIS_XML_NAMESPACE = "http://ibatis.apache.org";
+ public const string DAO_NAMESPACE_PREFIX = "dao";
+ private const string PROVIDERS_NAMESPACE_PREFIX = "provider";
+ private const string PROVIDER_XML_NAMESPACE = "http://ibatis.apache.org/providers";
+ private const string DAO_XML_NAMESPACE = "http://ibatis.apache.org/dataAccess";
private const string PROPERTY_ELEMENT_KEY_ATTRIB = "key";
private const string PROPERTY_ELEMENT_VALUE_ATTRIB = "value";
@@ -335,7 +337,8 @@
configurationScope.DaoConfigDocument = document;
configurationScope.XmlNamespaceManager = new XmlNamespaceManager(configurationScope.DaoConfigDocument.NameTable);
- configurationScope.XmlNamespaceManager.AddNamespace(XML_NAMESPACE_PREFIX, IBATIS_XML_NAMESPACE);
+ configurationScope.XmlNamespaceManager.AddNamespace(DAO_NAMESPACE_PREFIX, DAO_XML_NAMESPACE);
+ configurationScope.XmlNamespaceManager.AddNamespace(PROVIDERS_NAMESPACE_PREFIX, PROVIDER_XML_NAMESPACE);
try
{
@@ -385,7 +388,7 @@
serializer = new XmlSerializer(typeof(Provider));
- foreach (XmlNode node in xmlProviders.SelectNodes(ApplyNamespacePrefix(XML_PROVIDER), configurationScope.XmlNamespaceManager ) )
+ foreach (XmlNode node in xmlProviders.SelectNodes(ApplyProviderNamespacePrefix(XML_PROVIDER), configurationScope.XmlNamespaceManager ) )
{
configurationScope.ErrorContext.Resource = node.InnerXml.ToString();
@@ -781,7 +784,7 @@
configurationScope.ErrorContext.Resource = node.InnerXml.ToString();
configurationScope.ErrorContext.MoreInfo = "configure data source";
- serializer = new XmlSerializer(typeof(DataSource));
+ serializer = new XmlSerializer(typeof(DataSourceConfig));
dataSource = (DataSource)serializer.Deserialize(new XmlNodeReader(node));
@@ -828,10 +831,21 @@
/// </summary>
/// <param name="elementName"></param>
/// <returns></returns>
- public static string ApplyNamespacePrefix( string elementName )
+ public string ApplyNamespacePrefix( string elementName )
{
- return XML_NAMESPACE_PREFIX+ ":" + elementName.
- Replace("/","/"+XML_NAMESPACE_PREFIX+":");
+ return DAO_NAMESPACE_PREFIX+ ":" + elementName.
+ Replace("/","/"+DAO_NAMESPACE_PREFIX+":");
+ }
+
+ /// <summary>
+ /// Apply the provider namespace prefix
+ /// </summary>
+ /// <param name="elementName"></param>
+ /// <returns></returns>
+ public string ApplyProviderNamespacePrefix( string elementName )
+ {
+ return PROVIDERS_NAMESPACE_PREFIX+ ":" + elementName.
+ Replace("/","/"+PROVIDERS_NAMESPACE_PREFIX+":");
}
#endregion
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess/IBatisNet.DataAccess.csproj
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess/IBatisNet.DataAccess.csproj?rev=210008&r1=210007&r2=210008&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess/IBatisNet.DataAccess.csproj (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess/IBatisNet.DataAccess.csproj Sun Jul 10 06:06:38 2005
@@ -159,6 +159,11 @@
BuildAction = "Compile"
/>
<File
+ RelPath = "Configuration\DataSourceConfig.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
RelPath = "Configuration\DomDaoManagerBuilder.cs"
SubType = "Code"
BuildAction = "Compile"