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/03/05 13:29:29 UTC

svn commit: r156239 - incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration

Author: gbayon
Date: Sat Mar  5 04:29:24 2005
New Revision: 156239

URL: http://svn.apache.org/viewcvs?view=rev&rev=156239
Log:
- Renamed Resources.RootApplication ot Resources.ApplicationBase in IBatisNet.Common.Utilities + fixed issue in init of ApplicationBase
- Updated Nunit tests config file

Added:
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/ChangeLog.txt
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/DataBase-Template.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/cool.jpg   (with props)
Removed:
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/DataBase.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/cool.jpg
Modified:
    incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Resources.cs
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.csproj
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/BaseDaoTest.cs
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/NHibernateDaoTest.cs
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_SqlClient.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/BaseTest.cs
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/ParameterMapTest.cs
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/ReadMe.txt
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Resources.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Resources.cs?view=diff&r1=156238&r2=156239
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Resources.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/Resources.cs Sat Mar  5 04:29:24 2005
@@ -52,7 +52,7 @@
 	{
 
 		#region Fields
-		private static string _rootDirectory = AppDomain.CurrentDomain.BaseDirectory.Replace(@"\bin","").Replace(@"\Debug","").Replace(@"\Release","");
+		private static string _applicationBase = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
 		private static string _baseDirectory = AppDomain.CurrentDomain.BaseDirectory;
 		private static CachedTypeResolver _cachedTypeResolver = null;
 		private static readonly ILog _logger = LogManager.GetLogger( System.Reflection.MethodBase.GetCurrentMethod().DeclaringType );
@@ -61,13 +61,13 @@
 
 		#region Properties
 		/// <summary>
-		/// Get the root directory of the application
+		/// The name of the directory containing the application
 		/// </summary>
-		public static string RootDirectory
+		public static string ApplicationBase
 		{
 			get
 			{
-				return _rootDirectory;
+				return _applicationBase;
 			}
 		}
 		#endregion
@@ -92,7 +92,7 @@
 
 			try 
 			{
-				XmlTextReader reader = new XmlTextReader(_baseDirectory + Path.DirectorySeparatorChar + fileName);
+				XmlTextReader reader = new XmlTextReader(Path.Combine(_baseDirectory, fileName));
 				config.Load(reader);
 				reader.Close();
 			}
@@ -143,7 +143,7 @@
 
 			if (node.Attributes["resource"] != null)
 			{
-				path = _rootDirectory + Path.DirectorySeparatorChar + node.Attributes["resource"].Value;
+				path = Path.Combine(_applicationBase, node.Attributes["resource"].Value);
 			}
 			else if (node.Attributes["url"] != null)
 			{
@@ -166,7 +166,7 @@
 
 			try 
 			{
-				reader = new XmlTextReader(_rootDirectory + Path.DirectorySeparatorChar + resource);
+				reader = new XmlTextReader(Path.Combine(_applicationBase, resource));
 				config.Load(reader);
 			}
 			catch(Exception e)
@@ -323,7 +323,7 @@
 
 			if (!File.Exists(path)) 
 			{
-				file = _rootDirectory + Path.DirectorySeparatorChar + path;
+				file = Path.Combine(_applicationBase, path);
 			}
 			else
 			{

Added: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/ChangeLog.txt
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/ChangeLog.txt?view=auto&rev=156239
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/ChangeLog.txt (added)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/ChangeLog.txt Sat Mar  5 04:29:24 2005
@@ -0,0 +1,8 @@
+IBatisNet DataAcess Change Log
+
+------------------------------
+1.5.* - XX/XX/XXXX
+------------------------------
+
+- Renamed Resources.RootApplication ot Resources.ApplicationBase in IBatisNet.Common.Utilities 
+  + fixed issue in init of ApplicationBase
\ No newline at end of file

Added: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/DataBase-Template.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/DataBase-Template.config?view=auto&rev=156239
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/DataBase-Template.config (added)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/DataBase-Template.config Sat Mar  5 04:29:24 2005
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<settings>
+	<!--   User application and configured property settings go here.-->
+	<!-- To run tests, create a file named DataBase.config 
+		 with your own value for datasource.
+		 (don't included it in the solution and don't commit it in SVN)
+	-->
+	<!--   Example: <add key="settingName" value="settingValue"/> -->
+	<add key="userid" value="IBatisNet" />
+	<add key="password" value="test" />
+	<add key="database" value="IBatisNet" />
+	<add key="datasource" value="(local)\NetSDK" />
+	<add key="useridHibernate" value="NHibernate" />
+	<add key="databaseHibernate" value="NHibernate" />
+	<add key="driverOdbc" value="{SQL Server}" />
+	<add key="datasourceMySql" value="localhost" />
+</settings>

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.csproj
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.csproj?view=diff&r1=156238&r2=156239
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.csproj (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.csproj Sat Mar  5 04:29:24 2005
@@ -124,11 +124,11 @@
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "cool.jpg"
+                    RelPath = "ChangeLog.txt"
                     BuildAction = "Content"
                 />
                 <File
-                    RelPath = "DataBase.config"
+                    RelPath = "DataBase-Template.config"
                     BuildAction = "None"
                 />
                 <File

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/BaseDaoTest.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/BaseDaoTest.cs?view=diff&r1=156238&r2=156239
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/BaseDaoTest.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/BaseDaoTest.cs Sat Mar  5 04:29:24 2005
@@ -34,9 +34,11 @@
 		static BaseDaoTest()
 		{
 	
-			ScriptDirectory = Resources.RootDirectory + Path.DirectorySeparatorChar +
-				"Scripts" + Path.DirectorySeparatorChar +
-				ConfigurationSettings.AppSettings["database"]+ Path.DirectorySeparatorChar;
+			ScriptDirectory = Path.Combine( Path.Combine( Path.Combine( Path.Combine(Resources.ApplicationBase, ".."), ".."), "Scripts"), ConfigurationSettings.AppSettings["database"]) + Path.DirectorySeparatorChar;
+				
+//				Resources.RootDirectory + Path.DirectorySeparatorChar +
+//				"Scripts" + Path.DirectorySeparatorChar +
+//				ConfigurationSettings.AppSettings["database"]+ Path.DirectorySeparatorChar;
 		}
 
 		/// <summary>

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/NHibernateDaoTest.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/NHibernateDaoTest.cs?view=diff&r1=156238&r2=156239
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/NHibernateDaoTest.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/NUnit/DaoTests/NHibernateDaoTest.cs Sat Mar  5 04:29:24 2005
@@ -32,9 +32,10 @@
 		[SetUp] 
 		public void SetUp() 
 		{
-			string scriptDirectory = Resources.RootDirectory + Path.DirectorySeparatorChar +
-				"Scripts" + Path.DirectorySeparatorChar +
-				ConfigurationSettings.AppSettings["database"]+ Path.DirectorySeparatorChar;
+			string scriptDirectory = Path.Combine( Path.Combine( Path.Combine( Path.Combine(Resources.ApplicationBase, ".."), ".."), "Scripts"), ConfigurationSettings.AppSettings["database"]) + Path.DirectorySeparatorChar;
+//				Resources.RootDirectory + Path.DirectorySeparatorChar +
+//				"Scripts" + Path.DirectorySeparatorChar +
+//				ConfigurationSettings.AppSettings["database"]+ Path.DirectorySeparatorChar;
 
 			DaoManager.Configure( "dao"+ "_" + ConfigurationSettings.AppSettings["database"] + "_"
 				+ ConfigurationSettings.AppSettings["providerType"] + ".config" );

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config?view=diff&r1=156238&r2=156239
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config Sat Mar  5 04:29:24 2005
@@ -6,7 +6,7 @@
 	</settings>
 
 	<!-- Rem : If used via a DataAccess context, properties tag will be ignored -->
-	<properties resource="database.config"/>
+	<properties resource="../../database.config"/>
 	<!-- <properties embedded="database.config, IBatisNet.DataAccess.Test"/> -->
 
 	<!-- ==== SqlClient configuration =========	-->
@@ -21,14 +21,14 @@
 	</alias>
 	<sqlMaps>
 		<!-- <sqlMap url="E:/Projet/IBatisNet/Source/IBatisNet.DataAccess.Test/Maps/MSSQL/SqlClient/Account.xml"/> ok -->
-		<sqlMap resource="Maps/MSSQL/SqlClient/Account.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/DynamicAccount.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/Order.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/Category.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/Complex.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/LineItem.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/Enumeration.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/Other.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/Account.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/DynamicAccount.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/Order.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/Category.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/Complex.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/LineItem.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/Enumeration.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/Other.xml"/>
 		<!-- Rem : If used as embbeded Resources, use
 		<sqlMap embedded="Account.xml, IBatisNet.DataAccess.Test"/>
 		-->

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_SqlClient.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_SqlClient.config?view=diff&r1=156238&r2=156239
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_SqlClient.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_SqlClient.config Sat Mar  5 04:29:24 2005
@@ -8,7 +8,7 @@
 	</daoSessionHandlers>
 	
 	<context id="SimpleDao" default="true">
-		<properties resource="database.config"/>
+		<properties resource="../../database.config"/>
 		
 		<!-- ==== SqlClient configuration (default provider) =========	-->
 		<database>
@@ -23,7 +23,7 @@
 	</context>
 	
 	<context id="SqlMapDao">
-		<properties resource="database.config"/>
+		<properties resource="../../database.config"/>
 		<!-- ==== SqlClient configuration =========	-->
 		<database>
 			<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"/>
@@ -39,7 +39,7 @@
 	</context>
 
 	<context id="NHibernateDao">
-		<properties resource="database.config"/>
+		<properties resource="../../database.config"/>
 
 		<database>
 			<dataSource name="NHibernate" connectionString="data source=${datasource};database=${databaseHibernate};user id=${useridHibernate};password=${password};connection reset=false;connection lifetime=5; min pool size=1; max pool size=50"/>

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj?view=diff&r1=156238&r2=156239
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj Sat Mar  5 04:29:24 2005
@@ -130,6 +130,10 @@
                     BuildAction = "Content"
                 />
                 <File
+                    RelPath = "bin\Debug\cool.jpg"
+                    BuildAction = "Content"
+                />
+                <File
                     RelPath = "bin\Debug\dao_Access_OleDb.config"
                     BuildAction = "None"
                 />

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/BaseTest.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/BaseTest.cs?view=diff&r1=156238&r2=156239
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/BaseTest.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/BaseTest.cs Sat Mar  5 04:29:24 2005
@@ -39,9 +39,10 @@
 		static BaseTest()
 		{
 
-			ScriptDirectory = Resources.RootDirectory + Path.DirectorySeparatorChar +
-				"Scripts" + Path.DirectorySeparatorChar +
-				ConfigurationSettings.AppSettings["database"]+ Path.DirectorySeparatorChar;
+			ScriptDirectory = Path.Combine(
+								Path.Combine(
+									Path.Combine(
+										Path.Combine(Resources.ApplicationBase, ".."), ".."), "Scripts"), ConfigurationSettings.AppSettings["database"]) + Path.DirectorySeparatorChar;
 		}
 
 		/// <summary>

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/ParameterMapTest.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/ParameterMapTest.cs?view=diff&r1=156238&r2=156239
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/ParameterMapTest.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/ParameterMapTest.cs Sat Mar  5 04:29:24 2005
@@ -279,7 +279,7 @@
 			Image _picture = null;
 
 			// first try without path
-			_picture = Image.FromFile( Resources.RootDirectory + Path.DirectorySeparatorChar + "cool.jpg");
+			_picture = Image.FromFile( Path.Combine(Resources.ApplicationBase, "cool.jpg") );
 
 			Assert.IsNotNull( _picture );
 			return _picture;

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/ReadMe.txt
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/ReadMe.txt?view=diff&r1=156238&r2=156239
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/ReadMe.txt (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/ReadMe.txt Sat Mar  5 04:29:24 2005
@@ -14,4 +14,5 @@
 3/ With the help of the DataBase-Template.config
    create a file named DataBase.config with your own value for datasource.
    (WARNInG : don't included it in the solution and don't commit it in SVN)
+   Put it in the bin/debug directory
 	

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config?view=diff&r1=156238&r2=156239
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config Sat Mar  5 04:29:24 2005
@@ -21,16 +21,16 @@
 	</alias>
 	<sqlMaps>
 		<!-- <sqlMap url="E:/Projet/IBatisNet/Source/IBatisNet.Test/Maps/MSSQL/SqlClient/Account.xml"/> ok -->
-		<sqlMap resource="Maps/MSSQL/SqlClient/Account.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/DynamicAccount.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/Order.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/Category.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/Complex.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/LineItem.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/Enumeration.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/Other.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/ResultClass.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/Document.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/Account.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/DynamicAccount.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/Order.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/Category.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/Complex.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/LineItem.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/Enumeration.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/Other.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/ResultClass.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/SqlClient/Document.xml"/>
 		<!-- Rem : If used as embbeded Resources, use
 		<sqlMap embedded="Account.xml, IBatisNet.Test"/>
 		-->

Added: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/cool.jpg
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/cool.jpg?view=auto&rev=156239
==============================================================================
Binary file - no diff available.

Propchange: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/cool.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt?view=diff&r1=156238&r2=156239
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt Sat Mar  5 04:29:24 2005
@@ -1,10 +1,11 @@
 IBatisNet Change Log
 
 ------------------------------
-1.1.* - XX/XX/XXXX
+1.2.* - XX/XX/XXXX
 ------------------------------
 - Fixed for JIRA 20.
 - Added nunit category 'NHibernate'
+- Renamed Resources.RootApplication ot Resources.ApplicationBase in IBatisNet.Common.Utilities + fixed issue in init of ApplicationBase
 
 ------------------------------
 1.1.458 Alpha- 12-jan-2005

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs?view=diff&r1=156238&r2=156239
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs Sat Mar  5 04:29:24 2005
@@ -1157,7 +1157,7 @@
 		private void ParseGlobalProperties(XmlNode xmlContext)
 		{
 			XmlNode nodeProperties = xmlContext.SelectSingleNode("properties");
-			_errorContext.Activity = "Loading global properties";
+			_errorContext.Activity = "loading global properties";
 
 			if (nodeProperties != null)
 			{