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/06 11:26:31 UTC

svn commit: r156302 - incubator/ibatis/trunk/cs/mapper/IBatisNet.Common incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug

Author: gbayon
Date: Sun Mar  6 02:26:28 2005
New Revision: 156302

URL: http://svn.apache.org/viewcvs?view=rev&rev=156302
Log:
- Fixed error in ScriptRunner added by Revision 155890 in ScriptRunner
- Updated config Files

Added:
    incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/ChangeLog.txt
Removed:
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/dao_Access_OleDb.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/dao_MSSQL_Odbc.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/dao_MSSQL_OleDb.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/dao_MSSQL_SqlClient.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/dao_MySql_ByteFx.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/dao_Oracle_ODP.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/dao_Oracle_OracleClient.config
Modified:
    incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/IBatisNet.Common.csproj
    incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/ScriptRunner.cs
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Access_OleDb.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_SqlClient.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MySql_ByteFx.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_ODP.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_OracleClient.config
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt

Added: incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/ChangeLog.txt
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/ChangeLog.txt?view=auto&rev=156302
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/ChangeLog.txt (added)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/ChangeLog.txt Sun Mar  6 02:26:28 2005
@@ -0,0 +1,8 @@
+IBatisNet Common Change Log
+
+------------------------------
+1.2.* - 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

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/IBatisNet.Common.csproj
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/IBatisNet.Common.csproj?view=diff&r1=156301&r2=156302
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/IBatisNet.Common.csproj (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/IBatisNet.Common.csproj Sun Mar  6 02:26:28 2005
@@ -108,6 +108,10 @@
                     BuildAction = "None"
                 />
                 <File
+                    RelPath = "ChangeLog.txt"
+                    BuildAction = "Content"
+                />
+                <File
                     RelPath = "DataSource.cs"
                     SubType = "Code"
                     BuildAction = "Compile"

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/ScriptRunner.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/ScriptRunner.cs?view=diff&r1=156301&r2=156302
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/ScriptRunner.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.Common/Utilities/ScriptRunner.cs Sun Mar  6 02:26:28 2005
@@ -73,8 +73,18 @@
 					case "oracle9.2":   
 					case "oracleClient1.0":   
 					case "ByteFx":
-					case "OleDb1.1":
 						sqlStatements = ParseScript(script);
+						break;   
+					case "OleDb1.1":
+						if (dataSource.ConnectionString.IndexOf("Microsoft.Jet.OLEDB")>0)
+						{
+							// Access
+							sqlStatements = ParseScript(script);
+						}
+						else
+						{
+							sqlStatements.Add(script);
+						}
 						break;                  
 					default:            
 						sqlStatements.Add(script);
@@ -86,10 +96,22 @@
 					case "oracle9.2":   
 					case "oracleClient1.0":   
 					case "ByteFx":
-					case "OleDb1.1":
 						script = script.Replace("\r\n"," ");
 						script = script.Replace("\t"," ");
 						sqlStatements.Add(script);
+						break;  
+					case "OleDb1.1":
+						if (dataSource.ConnectionString.IndexOf("Microsoft.Jet.OLEDB")>0)
+						{
+							// Access
+							script = script.Replace("\r\n"," ");
+							script = script.Replace("\t"," ");
+							sqlStatements.Add(script);
+						}
+						else
+						{
+							sqlStatements.Add(script);
+						}
 						break;                  
 					default:            
 						sqlStatements.Add(script);

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=156301&r2=156302
==============================================================================
--- 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 Sun Mar  6 02:26:28 2005
@@ -134,34 +134,6 @@
                     BuildAction = "Content"
                 />
                 <File
-                    RelPath = "bin\Debug\dao_Access_OleDb.config"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "bin\Debug\dao_MSSQL_Odbc.config"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "bin\Debug\dao_MSSQL_OleDb.config"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "bin\Debug\dao_MSSQL_SqlClient.config"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "bin\Debug\dao_MySql_ByteFx.config"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "bin\Debug\dao_Oracle_ODP.config"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "bin\Debug\dao_Oracle_OracleClient.config"
-                    BuildAction = "None"
-                />
-                <File
                     RelPath = "bin\Debug\IBatisNet.DataMapper.Test.dll.config"
                     BuildAction = "None"
                 />

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Access_OleDb.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Access_OleDb.config?view=diff&r1=156301&r2=156302
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Access_OleDb.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Access_OleDb.config Sun Mar  6 02:26:28 2005
@@ -7,7 +7,7 @@
 		<setting cacheModelsEnabled="true"/>
 	</settings>
 	
-	<properties resource="Database.config"/>
+	<properties resource="../../Database.config"/>
 		
 	<!-- ==== OleDb configuration =========	-->
 	<database>
@@ -20,16 +20,16 @@
 	</alias>
 	
 	<sqlMaps>
-		<sqlMap resource="Maps\Access\OleDb\Account.xml"/>
-		<sqlMap resource="Maps\Access\OleDb\DynamicAccount.xml"/>
-		<sqlMap resource="Maps\Access\OleDb\Order.xml"/>
-		<sqlMap resource="Maps\Access\OleDb\Category.xml"/>
-		<sqlMap resource="Maps\Access\OleDb\Complex.xml"/>
-		<sqlMap resource="Maps\Access\OleDb\LineItem.xml"/>
-		<sqlMap resource="Maps\Access\OleDb\Enumeration.xml"/>
-		<sqlMap resource="Maps\Access\OleDb\Other.xml"/>
-		<sqlMap resource="Maps\Access\OleDb\Document.xml"/>
-		<sqlMap resource="Maps\Access\OleDb\ResultClass.xml"/>
+		<sqlMap resource="../../Maps/Access/OleDb/Account.xml"/>
+		<sqlMap resource="../../Maps/Access/OleDb/DynamicAccount.xml"/>
+		<sqlMap resource="../../Maps/Access/OleDb/Order.xml"/>
+		<sqlMap resource="../../Maps/Access/OleDb/Category.xml"/>
+		<sqlMap resource="../../Maps/Access/OleDb/Complex.xml"/>
+		<sqlMap resource="../../Maps/Access/OleDb/LineItem.xml"/>
+		<sqlMap resource="../../Maps/Access/OleDb/Enumeration.xml"/>
+		<sqlMap resource="../../Maps/Access/OleDb/Other.xml"/>
+		<sqlMap resource="../../Maps/Access/OleDb/Document.xml"/>
+		<sqlMap resource="../../Maps/Access/OleDb/ResultClass.xml"/>
 	</sqlMaps>
 	
 </sqlMapConfig>

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config?view=diff&r1=156301&r2=156302
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config Sun Mar  6 02:26:28 2005
@@ -6,7 +6,7 @@
 		<setting cacheModelsEnabled="true"/>
 	</settings>
 	
-	<properties resource="database.config"/>
+	<properties resource="../../database.config"/>
 
 	<!-- ==== Odbc configuration =========	-->
 	<database>	
@@ -20,16 +20,16 @@
 	</alias>
 	
 	<sqlMaps>
-		<sqlMap resource="Maps\MSSQL\Odbc\Account.xml"/>
-		<sqlMap resource="Maps\MSSQL\Odbc\DynamicAccount.xml"/>
-		<sqlMap resource="Maps\MSSQL\Odbc\Order.xml"/>
-		<sqlMap resource="Maps\MSSQL\Odbc\Category.xml"/>
-		<sqlMap resource="Maps\MSSQL\Odbc\Complex.xml"/>
-		<sqlMap resource="Maps\MSSQL\Odbc\LineItem.xml"/>
-		<sqlMap resource="Maps\MSSQL\Odbc\Enumeration.xml"/>
-		<sqlMap resource="Maps\MSSQL\Odbc\Other.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/ResultClass.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/Document.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/Odbc/Account.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/Odbc/DynamicAccount.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/Odbc/Order.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/Odbc/Category.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/Odbc/Complex.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/Odbc/LineItem.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/Odbc/Enumeration.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/Odbc/Other.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/Odbc/ResultClass.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/Odbc/Document.xml"/>
 	</sqlMaps>
 	
 </sqlMapConfig>

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config?view=diff&r1=156301&r2=156302
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config Sun Mar  6 02:26:28 2005
@@ -7,7 +7,7 @@
 		<setting cacheModelsEnabled="true"/>
 	</settings>
 	
-	<properties resource="database.config"/>
+	<properties resource="../../database.config"/>
 		
 	<!-- ==== OleDb configuration =========	-->
 	<database>
@@ -20,16 +20,16 @@
 	</alias>
 	
 	<sqlMaps>
-		<sqlMap resource="Maps\MSSQL\OleDb\Account.xml"/>
-		<sqlMap resource="Maps\MSSQL\OleDb\DynamicAccount.xml"/>
-		<sqlMap resource="Maps\MSSQL\OleDb\Order.xml"/>
-		<sqlMap resource="Maps\MSSQL\OleDb\Category.xml"/>
-		<sqlMap resource="Maps\MSSQL\OleDb\Complex.xml"/>
-		<sqlMap resource="Maps\MSSQL\OleDb\LineItem.xml"/>
-		<sqlMap resource="Maps\MSSQL\OleDb\Enumeration.xml"/>
-		<sqlMap resource="Maps\MSSQL\OleDb\Other.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/ResultClass.xml"/>
-		<sqlMap resource="Maps/MSSQL/SqlClient/Document.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/OleDb/Account.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/OleDb/DynamicAccount.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/OleDb/Order.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/OleDb/Category.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/OleDb/Complex.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/OleDb/LineItem.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/OleDb/Enumeration.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/OleDb/Other.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/OleDb/ResultClass.xml"/>
+		<sqlMap resource="../../Maps/MSSQL/OleDb/Document.xml"/>
 	</sqlMaps>
 	
 </sqlMapConfig>

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=156301&r2=156302
==============================================================================
--- 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 Sun Mar  6 02:26:28 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.Test"/> -->
 
 	<!-- ==== SqlClient configuration =========	-->

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MySql_ByteFx.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MySql_ByteFx.config?view=diff&r1=156301&r2=156302
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MySql_ByteFx.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MySql_ByteFx.config Sun Mar  6 02:26:28 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.Test"/> -->
 
 	<!-- ==== OracleClient configuration =========	-->
@@ -21,14 +21,14 @@
 	</alias>
 	<sqlMaps>
 		<!-- <sqlMap url="E:/Projet/IBatisNet/Source/IBatisNet.Test/Maps/MySql/ByteFx/Account.xml"/> ok -->
-		<sqlMap resource="Maps/MySql/ByteFx/Account.xml"/>
-		<sqlMap resource="Maps/MySql/ByteFx/DynamicAccount.xml"/>
-		<sqlMap resource="Maps/MySql/ByteFx/Order.xml"/>
-		<sqlMap resource="Maps/MySql/ByteFx/Category.xml"/>
-		<sqlMap resource="Maps/MySql/ByteFx/Complex.xml"/>
-		<sqlMap resource="Maps/MySql/ByteFx/LineItem.xml"/>
-		<sqlMap resource="Maps/MySql/ByteFx/Enumeration.xml"/>
-		<sqlMap resource="Maps/MySql/ByteFx/Other.xml"/>
+		<sqlMap resource="../../Maps/MySql/ByteFx/Account.xml"/>
+		<sqlMap resource="../../Maps/MySql/ByteFx/DynamicAccount.xml"/>
+		<sqlMap resource="../../Maps/MySql/ByteFx/Order.xml"/>
+		<sqlMap resource="../../Maps/MySql/ByteFx/Category.xml"/>
+		<sqlMap resource="../../Maps/MySql/ByteFx/Complex.xml"/>
+		<sqlMap resource="../../Maps/MySql/ByteFx/LineItem.xml"/>
+		<sqlMap resource="../../Maps/MySql/ByteFx/Enumeration.xml"/>
+		<sqlMap resource="../../Maps/MySql/ByteFx/Other.xml"/>
 		<!-- Rem : If used as embbeded Resources, use
 		<sqlMap embedded="Account.xml, IBatisNet.Test"/>
 		-->

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_ODP.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_ODP.config?view=diff&r1=156301&r2=156302
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_ODP.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_ODP.config Sun Mar  6 02:26:28 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.Test"/> -->
 
 	<!-- ==== ODP configuration =========	-->
@@ -21,14 +21,14 @@
 	</alias>
 	<sqlMaps>
 		<!-- <sqlMap url="E:/Projet/IBatisNet/Source/IBatisNet.Test/Maps/Oracle/ODP/Account.xml"/> ok -->
-		<sqlMap resource="Maps/Oracle/ODP/Account.xml"/>
-		<sqlMap resource="Maps/Oracle/ODP/DynamicAccount.xml"/>
-		<sqlMap resource="Maps/Oracle/ODP/Order.xml"/>
-		<sqlMap resource="Maps/Oracle/ODP/Category.xml"/>
-		<sqlMap resource="Maps/Oracle/ODP/Complex.xml"/>
-		<sqlMap resource="Maps/Oracle/ODP/LineItem.xml"/>
-		<sqlMap resource="Maps/Oracle/ODP/Enumeration.xml"/>
-		<sqlMap resource="Maps/Oracle/ODP/Other.xml"/>
+		<sqlMap resource="../../Maps/Oracle/ODP/Account.xml"/>
+		<sqlMap resource="../../Maps/Oracle/ODP/DynamicAccount.xml"/>
+		<sqlMap resource="../../Maps/Oracle/ODP/Order.xml"/>
+		<sqlMap resource="../../Maps/Oracle/ODP/Category.xml"/>
+		<sqlMap resource="../../Maps/Oracle/ODP/Complex.xml"/>
+		<sqlMap resource="../../Maps/Oracle/ODP/LineItem.xml"/>
+		<sqlMap resource="../../Maps/Oracle/ODP/Enumeration.xml"/>
+		<sqlMap resource="../../Maps/Oracle/ODP/Other.xml"/>
 		<!-- Rem : If used as embbeded Resources, use
 		<sqlMap embedded="Account.xml, IBatisNet.Test"/>
 		-->

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_OracleClient.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_OracleClient.config?view=diff&r1=156301&r2=156302
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_OracleClient.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_OracleClient.config Sun Mar  6 02:26:28 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.Test"/> -->
 
 	<!-- ==== OracleClient configuration =========	-->
@@ -21,14 +21,14 @@
 	</alias>
 	<sqlMaps>
 		<!-- <sqlMap url="E:/Projet/IBatisNet/Source/IBatisNet.Test/Maps/Oracle/OracleClient/Account.xml"/> ok -->
-		<sqlMap resource="Maps/Oracle/OracleClient/Account.xml"/>
-		<sqlMap resource="Maps/Oracle/OracleClient/DynamicAccount.xml"/>
-		<sqlMap resource="Maps/Oracle/OracleClient/Order.xml"/>
-		<sqlMap resource="Maps/Oracle/OracleClient/Category.xml"/>
-		<sqlMap resource="Maps/Oracle/OracleClient/Complex.xml"/>
-		<sqlMap resource="Maps/Oracle/OracleClient/LineItem.xml"/>
-		<sqlMap resource="Maps/Oracle/OracleClient/Enumeration.xml"/>
-		<sqlMap resource="Maps/Oracle/OracleClient/Other.xml"/>
+		<sqlMap resource="../../Maps/Oracle/OracleClient/Account.xml"/>
+		<sqlMap resource="../../Maps/Oracle/OracleClient/DynamicAccount.xml"/>
+		<sqlMap resource="../../Maps/Oracle/OracleClient/Order.xml"/>
+		<sqlMap resource="../../Maps/Oracle/OracleClient/Category.xml"/>
+		<sqlMap resource="../../Maps/Oracle/OracleClient/Complex.xml"/>
+		<sqlMap resource="../../Maps/Oracle/OracleClient/LineItem.xml"/>
+		<sqlMap resource="../../Maps/Oracle/OracleClient/Enumeration.xml"/>
+		<sqlMap resource="../../Maps/Oracle/OracleClient/Other.xml"/>
 		<!-- Rem : If used as embbeded Resources, use
 		<sqlMap embedded="Account.xml, IBatisNet.Test"/>
 		-->

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=156301&r2=156302
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt Sun Mar  6 02:26:28 2005
@@ -5,7 +5,6 @@
 ------------------------------
 - 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