[Nhibernate-commit] SF.net SVN: nhibernate:[6004] trunk/nhibernate

[<ric...@us...>]

Revision: 6004
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=6004&view=rev
Author:   ricbrown
Date:     2011-08-09 13:25:29 +0000 (Tue, 09 Aug 2011)

Log Message:
-----------
Turned of Oracle creation until password updated.

Modified Paths:
--------------
    trunk/nhibernate/lib/teamcity/oracle/oracle_installation.txt
    trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs

Modified: trunk/nhibernate/lib/teamcity/oracle/oracle_installation.txt
===================================================================
--- trunk/nhibernate/lib/teamcity/oracle/oracle_installation.txt	2011-08-07 19:31:59 UTC (rev 6003)
+++ trunk/nhibernate/lib/teamcity/oracle/oracle_installation.txt	2011-08-09 13:25:29 UTC (rev 6004)
@@ -2,7 +2,9 @@
 Installation steps for Oracle (Express Edition) for NH TeamCity:
 
 1.  Download Oracle Database 10g Express Edition (OracleXE.exe):  http://www.oracle.com/technetwork/database/express-edition/downloads/102xewinsoft-090667.html;
-2.  Run the installer ... choose any HTTP port for the listener (e.g., 8081);
+        (Note: you'll need to sign-up for a (free) Oracle account to download)
+
+2.  Run the installer ... choose any HTTP port for the listener if asked (it may automatically choose the default 8080 if available);
 3.  Enter 'password' as the password for the SYS and SYSTEM accounts;
 4.  The setup should install Oracle (XE) on the machine;
 5.  Once the installation is complete, leave the option ticked to open the homepage for configuration.

Modified: trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs	2011-08-07 19:31:59 UTC (rev 6003)
+++ trunk/nhibernate/src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs	2011-08-09 13:25:29 UTC (rev 6004)
@@ -130,33 +130,35 @@
 
 		private static void SetupOracle(Cfg.Configuration cfg)
 		{
-			var connStr =
-				cfg.Properties[Cfg.Environment.ConnectionString]
-					.Replace("User ID=nhibernate", "User ID=SYSTEM")
-					.Replace("Password=nhibernate", "Password=password");
+			// disabled until system password is set on TeamCity
 
-			cfg.DataBaseIntegration(db =>
-				{
-					db.ConnectionString = connStr;
-					db.Dialect<NHibernate.Dialect.Oracle10gDialect>();
-					db.KeywordsAutoImport = Hbm2DDLKeyWords.None;
-				});
+			//var connStr =
+			//    cfg.Properties[Cfg.Environment.ConnectionString]
+			//        .Replace("User ID=nhibernate", "User ID=SYSTEM")
+			//        .Replace("Password=nhibernate", "Password=password");
 
-			using (var sf = cfg.BuildSessionFactory())
-			{
-				try
-				{
-					using(var s = sf.OpenSession())
-						s.CreateSQLQuery("drop user nhibernate cascade").ExecuteUpdate();
-				}
-				catch {}
+			//cfg.DataBaseIntegration(db =>
+			//    {
+			//        db.ConnectionString = connStr;
+			//        db.Dialect<NHibernate.Dialect.Oracle10gDialect>();
+			//        db.KeywordsAutoImport = Hbm2DDLKeyWords.None;
+			//    });
 
-				using (var s = sf.OpenSession())
-				{
-					s.CreateSQLQuery("create user nhibernate identified by nhibernate").ExecuteUpdate();
-					s.CreateSQLQuery("grant dba to nhibernate with admin option").ExecuteUpdate();
-				}
-			}
+			//using (var sf = cfg.BuildSessionFactory())
+			//{
+			//    try
+			//    {
+			//        using(var s = sf.OpenSession())
+			//            s.CreateSQLQuery("drop user nhibernate cascade").ExecuteUpdate();
+			//    }
+			//    catch {}
+
+			//    using (var s = sf.OpenSession())
+			//    {
+			//        s.CreateSQLQuery("create user nhibernate identified by nhibernate").ExecuteUpdate();
+			//        s.CreateSQLQuery("grant dba to nhibernate with admin option").ExecuteUpdate();
+			//    }
+			//}
 		}
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.