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/06/20 20:19:42 UTC

svn commit: r191530 - in /ibatis/trunk/cs/mapper: ./ IBatisNet.DataAccess.Test/ IBatisNet.DataAccess.Test/bin/Debug/

Author: gbayon
Date: Mon Jun 20 11:19:41 2005
New Revision: 191530

URL: http://svn.apache.org/viewcvs?rev=191530&view=rev
Log:
- Removed NHibernate dependencie from DataAccess composant

Modified:
    ibatis/trunk/cs/mapper/DataAccess.sln
    ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.csproj
    ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Access_OleDb.config
    ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_OleDb.config
    ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_SqlClient.config
    ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MySql_ByteFx.config
    ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Oracle_ODP.config
    ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Oracle_OracleClient.config
    ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/providers.config

Modified: ibatis/trunk/cs/mapper/DataAccess.sln
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/DataAccess.sln?rev=191530&r1=191529&r2=191530&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/DataAccess.sln (original)
+++ ibatis/trunk/cs/mapper/DataAccess.sln Mon Jun 20 11:19:41 2005
@@ -3,10 +3,6 @@
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBatisNet.DataAccess.Extensions", "IBatisNet.DataAccess.Extensions\IBatisNet.DataAccess.Extensions.csproj", "{342C92B4-2742-4C55-9374-A504FE3B6972}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBatisNet.Common", "IBatisNet.Common\IBatisNet.Common.csproj", "{BBC8DA4A-EA88-41D9-8B93-929B8F3ADADE}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
@@ -29,10 +25,6 @@
 		{BEFC4A45-7DF9-40E4-942C-82DC1BA5E708}.Debug.Build.0 = Debug|.NET
 		{BEFC4A45-7DF9-40E4-942C-82DC1BA5E708}.Release.ActiveCfg = Release|.NET
 		{BEFC4A45-7DF9-40E4-942C-82DC1BA5E708}.Release.Build.0 = Release|.NET
-		{342C92B4-2742-4C55-9374-A504FE3B6972}.Debug.ActiveCfg = Debug|.NET
-		{342C92B4-2742-4C55-9374-A504FE3B6972}.Debug.Build.0 = Debug|.NET
-		{342C92B4-2742-4C55-9374-A504FE3B6972}.Release.ActiveCfg = Release|.NET
-		{342C92B4-2742-4C55-9374-A504FE3B6972}.Release.Build.0 = Release|.NET
 		{BBC8DA4A-EA88-41D9-8B93-929B8F3ADADE}.Debug.ActiveCfg = Debug|.NET
 		{BBC8DA4A-EA88-41D9-8B93-929B8F3ADADE}.Debug.Build.0 = Debug|.NET
 		{BBC8DA4A-EA88-41D9-8B93-929B8F3ADADE}.Release.ActiveCfg = Release|.NET

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.csproj
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.csproj?rev=191530&r1=191529&r2=191530&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.csproj (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/IBatisNet.DataAccess.Test.csproj Mon Jun 20 11:19:41 2005
@@ -85,11 +85,6 @@
                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
                 />
                 <Reference
-                    Name = "IBatisNet.DataAccess.Extensions"
-                    Project = "{342C92B4-2742-4C55-9374-A504FE3B6972}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-                <Reference
                     Name = "IBatisNet.DataAccess"
                     Project = "{BEFC4A45-7DF9-40E4-942C-82DC1BA5E708}"
                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
@@ -105,11 +100,6 @@
                     HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
                 />
                 <Reference
-                    Name = "NHibernate"
-                    AssemblyName = "NHibernate"
-                    HintPath = "..\External-Bin\Net\1.1\NHibernate.dll"
-                />
-                <Reference
                     Name = "nunit.framework"
                     AssemblyName = "nunit.framework"
                     HintPath = "..\External-Bin\Net\1.1\nunit.framework.dll"
@@ -237,11 +227,6 @@
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Dao\Implementations\NHibernate\UserDao.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
                     RelPath = "Dao\Interfaces\IAccountDao.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
@@ -545,16 +530,6 @@
                 />
                 <File
                     RelPath = "NUnit\DaoTests\BaseDaoTest.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "NUnit\DaoTests\MutipleDaoTest.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "NUnit\DaoTests\NHibernateDaoTest.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Access_OleDb.config
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Access_OleDb.config?rev=191530&r1=191529&r2=191530&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Access_OleDb.config (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Access_OleDb.config Mon Jun 20 11:19:41 2005
@@ -2,11 +2,11 @@
 <daoConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:noNamespaceSchemaLocation="DaoConfig.xsd">
 	
-	<daoSessionHandlers>
+	<!-- <daoSessionHandlers>
 		<handler id="NHibernate" 
 			implementation="IBatisNet.DataAccess.Extensions.DaoSessionHandlers.NHibernateDaoSessionHandler, IBatisNet.DataAccess.Extensions">
 		</handler>
-	</daoSessionHandlers>
+	</daoSessionHandlers>	 -->
 	
 	<context id="SimpleDao" default="true">
 
@@ -43,7 +43,7 @@
 		</daoFactory>
 	</context>
 	
-	<context id="NHibernateDao">
+	<!-- <context id="NHibernateDao">
 		<properties resource="../../Database.config"/>
 
 		<database>
@@ -63,6 +63,6 @@
 		<daoFactory>
 			<dao interface="IBatisNet.DataAccess.Test.Dao.Interfaces.IUserDao, IBatisNet.DataAccess.Test" implementation="IBatisNet.DataAccess.Test.Dao.Implementations.NHibernate.UserDao, IBatisNet.DataAccess.Test"/>
 		</daoFactory>
-	</context>
+	</context>	 -->
 	
 </daoConfig>

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_OleDb.config
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_OleDb.config?rev=191530&r1=191529&r2=191530&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_OleDb.config (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_OleDb.config Mon Jun 20 11:19:41 2005
@@ -2,11 +2,11 @@
 <daoConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:noNamespaceSchemaLocation="DaoConfig.xsd">
 	
-	<daoSessionHandlers>
+	<!-- <daoSessionHandlers>
 		<handler id="NHibernate" 
 			implementation="IBatisNet.DataAccess.Extensions.DaoSessionHandlers.NHibernateDaoSessionHandler, IBatisNet.DataAccess.Extensions">
 		</handler>
-	</daoSessionHandlers>
+	</daoSessionHandlers> -->
 	
 	<context id="SimpleDao" default="true">
 

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_SqlClient.config
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_SqlClient.config?rev=191530&r1=191529&r2=191530&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_SqlClient.config (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MSSQL_SqlClient.config Mon Jun 20 11:19:41 2005
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <daoConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="DaoConfig.xsd">
 
-	<daoSessionHandlers>
+	<!-- <daoSessionHandlers>
 		<handler id="NHibernate" 
 			implementation="IBatisNet.DataAccess.Extensions.DaoSessionHandlers.NHibernateDaoSessionHandler, IBatisNet.DataAccess.Extensions">
 		</handler>
-	</daoSessionHandlers>
+	</daoSessionHandlers> -->
 	
 	<context id="SimpleDao" default="true">
 		<properties resource="../../database.config"/>
@@ -45,7 +45,7 @@
 		</daoFactory>
 	</context>
 
-	<context id="NHibernateDao">
+	<!-- <context id="NHibernateDao">
 		<properties resource="../../database.config"/>
 
 		<database>
@@ -64,5 +64,5 @@
 		<daoFactory>
 			<dao interface="IBatisNet.DataAccess.Test.Dao.Interfaces.IUserDao, IBatisNet.DataAccess.Test" implementation="IBatisNet.DataAccess.Test.Dao.Implementations.NHibernate.UserDao, IBatisNet.DataAccess.Test"/>
 		</daoFactory>
-	</context>
+	</context> -->
 </daoConfig>

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MySql_ByteFx.config
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MySql_ByteFx.config?rev=191530&r1=191529&r2=191530&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MySql_ByteFx.config (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_MySql_ByteFx.config Mon Jun 20 11:19:41 2005
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <daoConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="DaoConfig.xsd">
 
-	<daoSessionHandlers>
+	<!-- <daoSessionHandlers>
 		<handler id="NHibernate" 
 			implementation="IBatisNet.DataAccess.Extensions.DaoSessionHandlers.NHibernateDaoSessionHandler, IBatisNet.DataAccess.Extensions">
 		</handler>
-	</daoSessionHandlers>
+	</daoSessionHandlers> -->
 	
 	<context id="SimpleDao" default="true">
 		<properties resource="../../Database.config"/>
@@ -36,7 +36,7 @@
 		</daoFactory>
 	</context>
 
-	<context id="NHibernateDao">
+	<!-- <context id="NHibernateDao">
 		<properties resource="../../database.config"/>
 
 		<database>
@@ -47,9 +47,11 @@
 		<daoSessionHandler id="NHibernate">
 			<property name="hibernate.dialect" value="NHibernate.Dialect.MySQLDialect"/>
 			<property name="hibernate.connection.provider" value="NHibernate.Connection.DriverConnectionProvider"/>
+	-->
 			<!-- NHibernate 0.4.0 works with ByteFX through the ByteFXDataDriver -->
 			<!-- NHibernate 0.5.0 works with MySql.Data through the MySqlDataDriver -->
 			<!-- <property name="hibernate.connection.driver_class" value="NHibernate.Driver.MySqlDataDriver"/> -->
+			<!--
 			<property name="hibernate.connection.driver_class" value="NHibernate.Driver.ByteFXDataDriver"/>
 			<property name="mapping" value="IBatisNet.DataAccess.Test"/>
 			<property name="show_sql" value="false"/>
@@ -59,5 +61,5 @@
 		<daoFactory>
 			<dao interface="IBatisNet.DataAccess.Test.Dao.Interfaces.IUserDao, IBatisNet.DataAccess.Test" implementation="IBatisNet.DataAccess.Test.Dao.Implementations.NHibernate.UserDao, IBatisNet.DataAccess.Test"/>
 		</daoFactory>
-	</context>
+	</context> -->
 </daoConfig>

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Oracle_ODP.config
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Oracle_ODP.config?rev=191530&r1=191529&r2=191530&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Oracle_ODP.config (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Oracle_ODP.config Mon Jun 20 11:19:41 2005
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <daoConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="DaoConfig.xsd">
 
-	<daoSessionHandlers>
+	<!-- <daoSessionHandlers>
 		<handler id="NHibernate" 
 			implementation="IBatisNet.DataAccess.Extensions.DaoSessionHandlers.NHibernateDaoSessionHandler, IBatisNet.DataAccess.Extensions">
 		</handler>
-	</daoSessionHandlers>
+	</daoSessionHandlers>	 -->
 	
 	<context id="SimpleDao" default="true">
 		<properties resource="../../Database.config"/>
@@ -36,7 +36,7 @@
 		</daoFactory>
 	</context>
 
-	<context id="NHibernateDao">
+	<!-- <context id="NHibernateDao">
 		<properties resource="../../database.config"/>
 
 		<database>
@@ -56,5 +56,5 @@
 		<daoFactory>
 			<dao interface="IBatisNet.DataAccess.Test.Dao.Interfaces.IUserDao, IBatisNet.DataAccess.Test" implementation="IBatisNet.DataAccess.Test.Dao.Implementations.NHibernate.UserDao, IBatisNet.DataAccess.Test"/>
 		</daoFactory>
-	</context>
+	</context>	 -->
 </daoConfig>

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Oracle_OracleClient.config
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Oracle_OracleClient.config?rev=191530&r1=191529&r2=191530&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Oracle_OracleClient.config (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/dao_Oracle_OracleClient.config Mon Jun 20 11:19:41 2005
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <daoConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="DaoConfig.xsd">
 
-	<daoSessionHandlers>
+	<!-- <daoSessionHandlers>
 		<handler id="NHibernate" 
 			implementation="IBatisNet.DataAccess.Extensions.DaoSessionHandlers.NHibernateDaoSessionHandler, IBatisNet.DataAccess.Extensions">
 		</handler>
-	</daoSessionHandlers>
+	</daoSessionHandlers>-->
 	
 	<context id="SimpleDao" default="true">
 		<properties resource="../../Database.config"/>
@@ -36,7 +36,7 @@
 		</daoFactory>
 	</context>
 
-	<context id="NHibernateDao">
+	<!-- <context id="NHibernateDao">
 		<properties resource="../../database.config"/>
 
 		<database>
@@ -56,5 +56,5 @@
 		<daoFactory>
 			<dao interface="IBatisNet.DataAccess.Test.Dao.Interfaces.IUserDao, IBatisNet.DataAccess.Test" implementation="IBatisNet.DataAccess.Test.Dao.Implementations.NHibernate.UserDao, IBatisNet.DataAccess.Test"/>
 		</daoFactory>
-	</context>
+	</context>-->
 </daoConfig>

Modified: ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/providers.config
URL: http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/providers.config?rev=191530&r1=191529&r2=191530&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/providers.config (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataAccess.Test/bin/Debug/providers.config Mon Jun 20 11:19:41 2005
@@ -108,8 +108,7 @@
 	<provider 
 		name="oracleClient1.0" 
 		description="Oracle, Microsoft provider V1.0.5000.0"
-		enabled="true" 
-		default="false"
+		enabled="false" 
 		assemblyName="System.Data.OracleClient, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" 
 		connectionClass="System.Data.OracleClient.OracleConnection"  
 		commandClass="System.Data.OracleClient.OracleCommand" 
@@ -126,7 +125,7 @@
 	<provider
 		name="ByteFx"
 		description="MySQL, ByteFx provider V0.7.6.15073"
-		enabled="true"
+		enabled="false"
 		assemblyName="ByteFX.MySqlClient, Version=0.7.6.15073, Culture=neutral, PublicKeyToken=f2fef6fed1732fc1"
 		connectionClass="ByteFX.Data.MySqlClient.MySqlConnection" 
 		commandClass="ByteFX.Data.MySqlClient.MySqlCommand"