OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties. Fix some inconsistent newlines.

0.6.0-stable
Jeff Ames 2008-07-19 09:35:48 +00:00
parent 351ee78d2a
commit 19fd2230bf
3 changed files with 301 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

432
OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
View File

@ -1,216 +1,216 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Data; using System.Data;
namespace OpenSim.Data.MSSQL namespace OpenSim.Data.MSSQL
{ {
/// <summary> /// <summary>
/// Encapsulates a SqlCommand object but ensures that when it is disposed, its connection is closed and disposed also. /// Encapsulates a SqlCommand object but ensures that when it is disposed, its connection is closed and disposed also.
/// </summary> /// </summary>
internal class AutoClosingSqlCommand : IDbCommand internal class AutoClosingSqlCommand : IDbCommand
{ {
private SqlCommand realCommand; private SqlCommand realCommand;
public AutoClosingSqlCommand(SqlCommand cmd) public AutoClosingSqlCommand(SqlCommand cmd)
{ {
realCommand = cmd; realCommand = cmd;
} }
#region IDbCommand Members #region IDbCommand Members
public void Cancel() public void Cancel()
{ {
realCommand.Cancel(); realCommand.Cancel();
} }
public string CommandText public string CommandText
{ {
get get
{ {
return realCommand.CommandText; return realCommand.CommandText;
} }
set set
{ {
realCommand.CommandText = value; realCommand.CommandText = value;
} }
} }
public int CommandTimeout public int CommandTimeout
{ {
get get
{ {
return realCommand.CommandTimeout; return realCommand.CommandTimeout;
} }
set set
{ {
realCommand.CommandTimeout = value; realCommand.CommandTimeout = value;
} }
} }
public CommandType CommandType public CommandType CommandType
{ {
get get
{ {
return realCommand.CommandType; return realCommand.CommandType;
} }
set set
{ {
realCommand.CommandType = value; realCommand.CommandType = value;
} }
} }
IDbConnection IDbCommand.Connection IDbConnection IDbCommand.Connection
{ {
get get
{ {
return realCommand.Connection; return realCommand.Connection;
} }
set set
{ {
realCommand.Connection = (SqlConnection) value; realCommand.Connection = (SqlConnection) value;
} }
} }
public SqlConnection Connection public SqlConnection Connection
{ {
get get
{ {
return realCommand.Connection; return realCommand.Connection;
} }
} }
IDbDataParameter IDbCommand.CreateParameter() IDbDataParameter IDbCommand.CreateParameter()
{ {
return realCommand.CreateParameter(); return realCommand.CreateParameter();
} }
public SqlParameter CreateParameter() public SqlParameter CreateParameter()
{ {
return realCommand.CreateParameter(); return realCommand.CreateParameter();
} }
public int ExecuteNonQuery() public int ExecuteNonQuery()
{ {
return realCommand.ExecuteNonQuery(); return realCommand.ExecuteNonQuery();
} }
IDataReader IDbCommand.ExecuteReader(CommandBehavior behavior) IDataReader IDbCommand.ExecuteReader(CommandBehavior behavior)
{ {
return realCommand.ExecuteReader(behavior); return realCommand.ExecuteReader(behavior);
} }
public SqlDataReader ExecuteReader(CommandBehavior behavior) public SqlDataReader ExecuteReader(CommandBehavior behavior)
{ {
return realCommand.ExecuteReader(behavior); return realCommand.ExecuteReader(behavior);
} }
IDataReader IDbCommand.ExecuteReader() IDataReader IDbCommand.ExecuteReader()
{ {
return realCommand.ExecuteReader(); return realCommand.ExecuteReader();
} }
public SqlDataReader ExecuteReader() public SqlDataReader ExecuteReader()
{ {
return realCommand.ExecuteReader(); return realCommand.ExecuteReader();
} }
public object ExecuteScalar() public object ExecuteScalar()
{ {
return realCommand.ExecuteScalar(); return realCommand.ExecuteScalar();
} }
IDataParameterCollection IDbCommand.Parameters IDataParameterCollection IDbCommand.Parameters
{ {
get { return realCommand.Parameters; } get { return realCommand.Parameters; }
} }
public SqlParameterCollection Parameters public SqlParameterCollection Parameters
{ {
get { return realCommand.Parameters; } get { return realCommand.Parameters; }
} }
public void Prepare() public void Prepare()
{ {
realCommand.Prepare(); realCommand.Prepare();
} }
IDbTransaction IDbCommand.Transaction IDbTransaction IDbCommand.Transaction
{ {
get get
{ {
return realCommand.Transaction; return realCommand.Transaction;
} }
set set
{ {
realCommand.Transaction = (SqlTransaction) value; realCommand.Transaction = (SqlTransaction) value;
} }
} }
UpdateRowSource IDbCommand.UpdatedRowSource UpdateRowSource IDbCommand.UpdatedRowSource
{ {
get get
{ {
return realCommand.UpdatedRowSource; return realCommand.UpdatedRowSource;
} }
set set
{ {
realCommand.UpdatedRowSource = value; realCommand.UpdatedRowSource = value;
} }
} }
#endregion #endregion
#region IDisposable Members #region IDisposable Members
public void Dispose() public void Dispose()
{ {
SqlConnection conn = realCommand.Connection; SqlConnection conn = realCommand.Connection;
try try
{ {
realCommand.Dispose(); realCommand.Dispose();
} }
finally finally
{ {
try try
{ {
conn.Close(); conn.Close();
} }
finally finally
{ {
conn.Dispose(); conn.Dispose();
} }
} }
} }
#endregion #endregion
} }
} }

46
OpenSim/Data/MySQL/MySQLEstateData.cs
View File

@ -59,29 +59,29 @@ namespace OpenSim.Data.MySQL
public void Initialise(string connectionString) public void Initialise(string connectionString)
{ {
m_connectionString = connectionString; m_connectionString = connectionString;
int passPosition = 0; int passPosition = 0;
int passEndPosition = 0; int passEndPosition = 0;
string displayConnectionString = null; string displayConnectionString = null;
try try
{ // hide the password in the connection string { // hide the password in the connection string
passPosition = m_connectionString.IndexOf("password", StringComparison.OrdinalIgnoreCase); passPosition = m_connectionString.IndexOf("password", StringComparison.OrdinalIgnoreCase);
passPosition = m_connectionString.IndexOf("=", passPosition); passPosition = m_connectionString.IndexOf("=", passPosition);
if (passPosition < m_connectionString.Length) if (passPosition < m_connectionString.Length)
passPosition += 1; passPosition += 1;
passEndPosition = m_connectionString.IndexOf(";", passPosition); passEndPosition = m_connectionString.IndexOf(";", passPosition);
displayConnectionString = m_connectionString.Substring(0, passPosition); displayConnectionString = m_connectionString.Substring(0, passPosition);
displayConnectionString += "***"; displayConnectionString += "***";
displayConnectionString += m_connectionString.Substring(passEndPosition, m_connectionString.Length - passEndPosition); displayConnectionString += m_connectionString.Substring(passEndPosition, m_connectionString.Length - passEndPosition);
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Debug("Exception: password not found in connection string\n" + e.ToString()); m_log.Debug("Exception: password not found in connection string\n" + e.ToString());
} }
m_log.Info("[REGION DB]: MySql - connecting: " + displayConnectionString); m_log.Info("[REGION DB]: MySql - connecting: " + displayConnectionString);
//m_log.Info("[ESTATE DB]: MySql - connecting: "+m_connectionString); //m_log.Info("[ESTATE DB]: MySql - connecting: "+m_connectionString);

124
OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs
View File

@ -1,62 +1,62 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System.Collections.Generic; using System.Collections.Generic;
using NUnit.Framework; using NUnit.Framework;
using OpenSim.Tests.Common; using OpenSim.Tests.Common;
using OpenSim.Region.ScriptEngine.Common; using OpenSim.Region.ScriptEngine.Common;
namespace OpenSim.Region.ScriptEngine.Common.Tests namespace OpenSim.Region.ScriptEngine.Common.Tests
{ {
[TestFixture] [TestFixture]
public class LSL_TypesTestVector3 public class LSL_TypesTestVector3
{ {
/// <summary> /// <summary>
/// Tests for Vector3 /// Tests for Vector3
/// </summary> /// </summary>
[Test] [Test]
public void TestDotProduct() public void TestDotProduct()
{ {
// The numbers we test for. // The numbers we test for.
Dictionary<string, double> expectsSet = new Dictionary<string, double>(); Dictionary<string, double> expectsSet = new Dictionary<string, double>();
expectsSet.Add("<1, 2, 3> * <2, 3, 4>", 20.0); expectsSet.Add("<1, 2, 3> * <2, 3, 4>", 20.0);
expectsSet.Add("<1, 2, 3> * <0, 0, 0>", 0.0); expectsSet.Add("<1, 2, 3> * <0, 0, 0>", 0.0);
double result; double result;
string[] parts; string[] parts;
string[] delim = { "*" }; string[] delim = { "*" };
foreach (KeyValuePair<string, double> ex in expectsSet) foreach (KeyValuePair<string, double> ex in expectsSet)
{ {
parts = ex.Key.Split(delim, System.StringSplitOptions.None); parts = ex.Key.Split(delim, System.StringSplitOptions.None);
result = new LSL_Types.Vector3(parts[0]) * new LSL_Types.Vector3(parts[1]); result = new LSL_Types.Vector3(parts[0]) * new LSL_Types.Vector3(parts[1]);
Assert.AreEqual(ex.Value, result); Assert.AreEqual(ex.Value, result);
} }
} }
} }
} }