ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 13:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:

Browse Source 
* Added log4net dependency to physxplugin in prebuild.xml.
* Added missing m_log fields to classes.
* Replaced Console.WriteLine with appropriate m_log.Xxxx
* Tested that nant test target runs succesfully.
* Tested that local opensim sandbox starts up without errors.
This commit is contained in:
Charles Krinke
2009-02-22 20:52:55 +00:00
parent 913654f2c9
commit 8f55b9d735
117 changed files with 580 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/MySQL/MySQLManager.cs
View File

@@ -1030,7 +1030,6 @@ namespace OpenSim.Data.MySQL
{
IDbCommand result = Query(sql, parameters);
//Console.WriteLine(result.CommandText);
// int x;
// if ((x = result.ExecuteNonQuery()) > 0)
// {
@@ -1123,7 +1122,6 @@ namespace OpenSim.Data.MySQL
{
IDbCommand result = Query(sql, parameters);
//Console.WriteLine(result.CommandText);
// int x;
// if ((x = result.ExecuteNonQuery()) > 0)
// {

7
OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.MySQL.Tests
{
[TestFixture]
public class MySQLAssetTest : BasicAssetTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public MySQLManager database;
public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error(e.ToString());
Assert.Ignore();
}
}
@@ -73,4 +76,4 @@ namespace OpenSim.Data.MySQL.Tests
}
}
}
}
}

5
OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.MySQL.Tests
{
[TestFixture]
public class MySQLEstateTest : BasicEstateTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public MySQLManager database;
public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -56,7 +59,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error("Exception {0}", e);
Assert.Ignore();
}
}

8
OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
View File

@@ -28,12 +28,16 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.MySQL.Tests
{
[TestFixture]
public class MySQLGridTest : BasicGridTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public MySQLManager database;
public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -54,7 +58,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error("Exception {0}", e);
Assert.Ignore();
}
}
@@ -73,4 +77,4 @@ namespace OpenSim.Data.MySQL.Tests
}
}
}
}
}

5
OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.MySQL.Tests
{
[TestFixture]
public class MySQLInventoryTest : BasicInventoryTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public MySQLManager database;
public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error("Exception {0}", e);
Assert.Ignore();
}
}

7
OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.MySQL.Tests
{
[TestFixture]
public class MySQLRegionTest : BasicRegionTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public MySQLManager database;
public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error("Exception {0}", e);
Assert.Ignore();
}
}
@@ -87,4 +90,4 @@ namespace OpenSim.Data.MySQL.Tests
}
}
}
}
}

7
OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
View File

@@ -28,12 +28,15 @@
using System;
using NUnit.Framework;
using OpenSim.Data.Tests;
using log4net;
using System.Reflection;
namespace OpenSim.Data.MySQL.Tests
{
[TestFixture]
public class MySQLUserTest : BasicUserTest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public string file;
public MySQLManager database;
public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
Console.WriteLine("Exception {0}", e);
m_log.Error("Exception {0}", e);
Assert.Ignore();
}
}
@@ -78,4 +81,4 @@ namespace OpenSim.Data.MySQL.Tests
}
}
}
}
}