ibatis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gba...@apache.org
Subject svn commit: r374181 - in /ibatis/trunk/cs/mapper: IBatisNet.Common/Logging/ IBatisNet.Common/Utilities/ IBatisNet.Common/Utilities/TypesResolver/ IBatisNet.DataMapper/Configuration/
Date Wed, 01 Feb 2006 21:45:19 GMT
Author: gbayon
Date: Wed Feb  1 13:45:07 2006
New Revision: 374181

URL: http://svn.apache.org/viewcvs?rev=374181&view=rev
Log:
- Added Fix for .NET V2

Modified:
    ibatis/trunk/cs/mapper/IBatisNet.Common/Logging/ConfigurationSectionHandler.cs
    ibatis/trunk/cs/mapper/IBatisNet.Common/Logging/LogManager.cs
    ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Resources.cs
    ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/TypesResolver/TypeResolver.cs
    ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs

Modified: ibatis/trunk/cs/mapper/IBatisNet.Common/Logging/ConfigurationSectionHandler.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common/Logging/ConfigurationSectionHandler.cs?rev=374181&r1=374180&r2=374181&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common/Logging/ConfigurationSectionHandler.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common/Logging/ConfigurationSectionHandler.cs Wed Feb
 1 13:45:07 2006
@@ -94,8 +94,12 @@
 			
 			XmlNodeList propertyNodes = logFactoryElement.SelectNodes( ARGUMENT_ELEMENT );
 
-            NameValueCollection properties = new NameValueCollection(StringComparer.InvariantCultureIgnoreCase);
-
+			NameValueCollection properties = null;
+#if dotnet2
+            properties = new NameValueCollection(StringComparer.InvariantCultureIgnoreCase);
+#else
+			properties = properties = new NameValueCollection( null, new CaseInsensitiveComparer()
);
+#endif
 			foreach ( XmlNode propertyNode in propertyNodes )
 			{
 				string key = string.Empty;

Modified: ibatis/trunk/cs/mapper/IBatisNet.Common/Logging/LogManager.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common/Logging/LogManager.cs?rev=374181&r1=374180&r2=374181&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common/Logging/LogManager.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common/Logging/LogManager.cs Wed Feb  1 13:45:07 2006
@@ -179,7 +179,11 @@
 		/// <returns></returns>
 		private static ILoggerFactoryAdapter BuildDefaultLoggerFactoryAdapter()
 		{
+#if dotnet2
             ILoggerFactoryAdapter simpleLogFactory = new ConsoleOutLoggerFA(new NameValueCollection(StringComparer.InvariantCultureIgnoreCase));
+#else
+			ILoggerFactoryAdapter simpleLogFactory = new ConsoleOutLoggerFA(new NameValueCollection(
null, new CaseInsensitiveComparer() ));
+#endif			
 			return simpleLogFactory;
 		}
 	}

Modified: ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Resources.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Resources.cs?rev=374181&r1=374180&r2=374181&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Resources.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Resources.cs Wed Feb  1 13:45:07 2006
@@ -404,11 +404,12 @@
 			FileAssemblyInfo fileInfo = new FileAssemblyInfo (resource);
 			if (fileInfo.IsAssemblyQualified)
 			{
-                #if dotnet2
-                Assembly assembly = Assembly.Load(fileInfo.AssemblyName);
-                #else
-                Assembly assembly = Assembly.LoadWithPartialName (typeInfo.AssemblyName);
-                #endif
+				Assembly assembly = null;
+#if dotnet2
+                assembly = Assembly.Load(fileInfo.AssemblyName);
+#else
+                assembly = Assembly.LoadWithPartialName (fileInfo.AssemblyName);
+#endif
                 Stream stream = assembly.GetManifestResourceStream(fileInfo.ResourceFileName);
 				// JIRA - IBATISNET-103 
 				if (stream == null)

Modified: ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/TypesResolver/TypeResolver.cs
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/TypesResolver/TypeResolver.cs?rev=374181&r1=374180&r2=374181&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/TypesResolver/TypeResolver.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/TypesResolver/TypeResolver.cs Wed Feb
 1 13:45:07 2006
@@ -43,7 +43,7 @@
 	/// <p>
 	/// The rationale behind the creation of this class is to centralise the
 	/// resolution of type names to <see cref="System.Type"/> instances beyond that
-	/// offered by the plain vanilla <see cref="System.Type.GetType()"/> method call.
+	/// offered by the plain vanilla System.Type.GetType method call.
 	/// </p>
 	/// </remarks>
 	/// <version>$Id: TypeResolver.cs,v 1.5 2004/09/28 07:51:47 springboy Exp $</version>
@@ -87,11 +87,12 @@
 			if (typeInfo.IsAssemblyQualified)
 			{
 				// assembly qualified... load the assembly, then the Type
-                #if dotnet2
-                Assembly assembly = Assembly.Load(typeInfo.AssemblyName);
-                #else
-                Assembly assembly = Assembly.LoadWithPartialName (typeInfo.AssemblyName);
-                #endif
+				Assembly assembly = null;
+#if dotnet2
+                assembly = Assembly.Load(typeInfo.AssemblyName);
+#else
+                assembly = Assembly.LoadWithPartialName (typeInfo.AssemblyName);
+#endif
                 if (assembly != null)
 				{
 					type = assembly.GetType (typeInfo.TypeName, true, true);

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=374181&r1=374180&r2=374181&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs Wed Feb
 1 13:45:07 2006
@@ -578,7 +578,7 @@
                 validatingReader = new XmlValidatingReader(new XmlTextReader(new StringReader(section.OuterXml)));
                 validatingReader.ValidationType = ValidationType.Schema;
 
-                validatingReader.Schemas.Add(xmlSchema);
+                validatingReader.Schemas.Add(schema);
 
                 // Wire up the call back.  The ValidationEvent is fired when the
                 // XmlValidatingReader hits an issue validating a section of the xml



Mime
View raw message