diff options
author | lbsa71 | 2009-02-12 09:53:12 +0000 |
---|---|---|
committer | lbsa71 | 2009-02-12 09:53:12 +0000 |
commit | 801da4346aeb3c08969c4845f5c595135a64470a (patch) | |
tree | 2f06e24c72e0d513c8e4c6aa9b75cd2c7b50f393 /OpenSim/Data/NHibernate | |
parent | Thanks Kitto Flora for a patch that adds automatic min fly height to ODE - Ma... (diff) | |
download | opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.zip opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.gz opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.bz2 opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.xz |
* optimized usings.
Diffstat (limited to '')
37 files changed, 40 insertions, 205 deletions
diff --git a/OpenSim/Data/NHibernate/ColorUserType.cs b/OpenSim/Data/NHibernate/ColorUserType.cs index 1ebd07c..955a442 100644 --- a/OpenSim/Data/NHibernate/ColorUserType.cs +++ b/OpenSim/Data/NHibernate/ColorUserType.cs | |||
@@ -27,12 +27,10 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Data; | 29 | using System.Data; |
30 | using OpenMetaverse; | 30 | using System.Drawing; |
31 | using OpenSim.Framework; | ||
32 | using NHibernate; | 31 | using NHibernate; |
33 | using NHibernate.SqlTypes; | 32 | using NHibernate.SqlTypes; |
34 | using NHibernate.UserTypes; | 33 | using NHibernate.UserTypes; |
35 | using System.Drawing; | ||
36 | 34 | ||
37 | namespace OpenSim.Data.NHibernate | 35 | namespace OpenSim.Data.NHibernate |
38 | { | 36 | { |
diff --git a/OpenSim/Data/NHibernate/LLQuaternionUserType.cs b/OpenSim/Data/NHibernate/LLQuaternionUserType.cs index 0cd5c6f..589d1e3 100644 --- a/OpenSim/Data/NHibernate/LLQuaternionUserType.cs +++ b/OpenSim/Data/NHibernate/LLQuaternionUserType.cs | |||
@@ -27,10 +27,10 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Data; | 29 | using System.Data; |
30 | using OpenMetaverse; | ||
31 | using NHibernate; | 30 | using NHibernate; |
32 | using NHibernate.SqlTypes; | 31 | using NHibernate.SqlTypes; |
33 | using NHibernate.UserTypes; | 32 | using NHibernate.UserTypes; |
33 | using OpenMetaverse; | ||
34 | 34 | ||
35 | namespace OpenSim.Data.NHibernate | 35 | namespace OpenSim.Data.NHibernate |
36 | { | 36 | { |
diff --git a/OpenSim/Data/NHibernate/LLUUIDUserType.cs b/OpenSim/Data/NHibernate/LLUUIDUserType.cs index a7781a3..5d62ef3 100644 --- a/OpenSim/Data/NHibernate/LLUUIDUserType.cs +++ b/OpenSim/Data/NHibernate/LLUUIDUserType.cs | |||
@@ -27,10 +27,10 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Data; | 29 | using System.Data; |
30 | using OpenMetaverse; | ||
31 | using NHibernate; | 30 | using NHibernate; |
32 | using NHibernate.SqlTypes; | 31 | using NHibernate.SqlTypes; |
33 | using NHibernate.UserTypes; | 32 | using NHibernate.UserTypes; |
33 | using OpenMetaverse; | ||
34 | 34 | ||
35 | namespace OpenSim.Data.NHibernate | 35 | namespace OpenSim.Data.NHibernate |
36 | { | 36 | { |
diff --git a/OpenSim/Data/NHibernate/LLVector3UserType.cs b/OpenSim/Data/NHibernate/LLVector3UserType.cs index 25a2bc6..75b522f 100644 --- a/OpenSim/Data/NHibernate/LLVector3UserType.cs +++ b/OpenSim/Data/NHibernate/LLVector3UserType.cs | |||
@@ -27,10 +27,10 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Data; | 29 | using System.Data; |
30 | using OpenMetaverse; | ||
31 | using NHibernate; | 30 | using NHibernate; |
32 | using NHibernate.SqlTypes; | 31 | using NHibernate.SqlTypes; |
33 | using NHibernate.UserTypes; | 32 | using NHibernate.UserTypes; |
33 | using OpenMetaverse; | ||
34 | 34 | ||
35 | namespace OpenSim.Data.NHibernate | 35 | namespace OpenSim.Data.NHibernate |
36 | { | 36 | { |
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs index d0046c6..f4527bf 100644 --- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs +++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs | |||
@@ -25,16 +25,10 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | using System.Collections; | ||
30 | using System.IO; | ||
31 | using System.Reflection; | 28 | using System.Reflection; |
32 | using System.Text.RegularExpressions; | ||
33 | using OpenMetaverse; | ||
34 | using log4net; | 29 | using log4net; |
35 | using NHibernate; | 30 | using OpenMetaverse; |
36 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
37 | using Environment=NHibernate.Cfg.Environment; | ||
38 | 32 | ||
39 | namespace OpenSim.Data.NHibernate | 33 | namespace OpenSim.Data.NHibernate |
40 | { | 34 | { |
diff --git a/OpenSim/Data/NHibernate/NHibernateGridData.cs b/OpenSim/Data/NHibernate/NHibernateGridData.cs index 07d9ab5..836c99e 100644 --- a/OpenSim/Data/NHibernate/NHibernateGridData.cs +++ b/OpenSim/Data/NHibernate/NHibernateGridData.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -27,15 +27,14 @@ | |||
27 | 27 | ||
28 | 28 | ||
29 | using System; | 29 | using System; |
30 | using System.Collections; | ||
30 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
31 | using System.Text; | ||
32 | using log4net; | ||
33 | using System.Reflection; | 32 | using System.Reflection; |
34 | using OpenSim.Framework; | 33 | using log4net; |
35 | using NHibernate; | 34 | using NHibernate; |
36 | using NHibernate.Criterion; | 35 | using NHibernate.Criterion; |
37 | using System.Collections; | ||
38 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using OpenSim.Framework; | ||
39 | 38 | ||
40 | namespace OpenSim.Data.NHibernate | 39 | namespace OpenSim.Data.NHibernate |
41 | { | 40 | { |
@@ -93,7 +92,7 @@ namespace OpenSim.Data.NHibernate | |||
93 | } | 92 | } |
94 | } | 93 | } |
95 | 94 | ||
96 | public override bool AuthenticateSim(OpenMetaverse.UUID UUID, ulong regionHandle, string simrecvkey) | 95 | public override bool AuthenticateSim(UUID UUID, ulong regionHandle, string simrecvkey) |
97 | { | 96 | { |
98 | bool throwHissyFit = false; // Should be true by 1.0 | 97 | bool throwHissyFit = false; // Should be true by 1.0 |
99 | 98 | ||
@@ -147,7 +146,7 @@ namespace OpenSim.Data.NHibernate | |||
147 | return DataResponse.RESPONSE_ERROR; | 146 | return DataResponse.RESPONSE_ERROR; |
148 | } | 147 | } |
149 | 148 | ||
150 | public override RegionProfileData GetProfileByUUID(OpenMetaverse.UUID UUID) | 149 | public override RegionProfileData GetProfileByUUID(UUID UUID) |
151 | { | 150 | { |
152 | return (RegionProfileData)manager.Load(typeof(RegionProfileData), UUID); | 151 | return (RegionProfileData)manager.Load(typeof(RegionProfileData), UUID); |
153 | } | 152 | } |
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs index e648396..0129800 100644 --- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs +++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs | |||
@@ -27,15 +27,12 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | ||
31 | using System.Reflection; | 30 | using System.Reflection; |
32 | using System.Text.RegularExpressions; | ||
33 | using OpenMetaverse; | ||
34 | using log4net; | 31 | using log4net; |
35 | using NHibernate; | 32 | using NHibernate; |
36 | using NHibernate.Criterion; | 33 | using NHibernate.Criterion; |
34 | using OpenMetaverse; | ||
37 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
38 | using Environment=NHibernate.Cfg.Environment; | ||
39 | 36 | ||
40 | namespace OpenSim.Data.NHibernate | 37 | namespace OpenSim.Data.NHibernate |
41 | { | 38 | { |
diff --git a/OpenSim/Data/NHibernate/NHibernateManager.cs b/OpenSim/Data/NHibernate/NHibernateManager.cs index 5e5eb47..51467da 100644 --- a/OpenSim/Data/NHibernate/NHibernateManager.cs +++ b/OpenSim/Data/NHibernate/NHibernateManager.cs | |||
@@ -26,14 +26,14 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Data.Common; | ||
29 | using System.Reflection; | 30 | using System.Reflection; |
30 | using System.IO; | ||
31 | using log4net; | 31 | using log4net; |
32 | using NHibernate; | 32 | using NHibernate; |
33 | using NHibernate.Cfg; | 33 | using NHibernate.Cfg; |
34 | using NHibernate.Tool.hbm2ddl; | 34 | using NHibernate.Tool.hbm2ddl; |
35 | using OpenMetaverse; | 35 | using OpenMetaverse; |
36 | using Environment = NHibernate.Cfg.Environment; | 36 | using Environment=NHibernate.Cfg.Environment; |
37 | 37 | ||
38 | namespace OpenSim.Data.NHibernate | 38 | namespace OpenSim.Data.NHibernate |
39 | { | 39 | { |
@@ -92,7 +92,7 @@ namespace OpenSim.Data.NHibernate | |||
92 | migrationSubType = "MySQLDialect"; | 92 | migrationSubType = "MySQLDialect"; |
93 | } | 93 | } |
94 | 94 | ||
95 | Migration migration = new Migration((System.Data.Common.DbConnection)sessionFactory.ConnectionProvider.GetConnection(), assembly, migrationSubType, store); | 95 | Migration migration = new Migration((DbConnection)sessionFactory.ConnectionProvider.GetConnection(), assembly, migrationSubType, store); |
96 | migration.Update(); | 96 | migration.Update(); |
97 | } | 97 | } |
98 | 98 | ||
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs index 29f4106..0cd3969 100644 --- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs +++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs | |||
@@ -26,19 +26,15 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
31 | using System.IO; | ||
32 | using System.Reflection; | 30 | using System.Reflection; |
33 | using System.Text.RegularExpressions; | ||
34 | using OpenMetaverse; | ||
35 | using log4net; | 31 | using log4net; |
36 | using NHibernate; | 32 | using NHibernate; |
37 | using NHibernate.Criterion; | 33 | using NHibernate.Criterion; |
34 | using OpenMetaverse; | ||
38 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
39 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
40 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
41 | using Environment = NHibernate.Cfg.Environment; | ||
42 | 38 | ||
43 | namespace OpenSim.Data.NHibernate | 39 | namespace OpenSim.Data.NHibernate |
44 | { | 40 | { |
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs index c739c86..7dfdcb5 100644 --- a/OpenSim/Data/NHibernate/NHibernateUserData.cs +++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs | |||
@@ -25,17 +25,13 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
30 | using System.IO; | ||
31 | using System.Reflection; | 29 | using System.Reflection; |
32 | using System.Text.RegularExpressions; | ||
33 | using OpenMetaverse; | ||
34 | using log4net; | 30 | using log4net; |
35 | using NHibernate; | 31 | using NHibernate; |
36 | using NHibernate.Criterion; | 32 | using NHibernate.Criterion; |
33 | using OpenMetaverse; | ||
37 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
38 | using Environment=NHibernate.Cfg.Environment; | ||
39 | 35 | ||
40 | namespace OpenSim.Data.NHibernate | 36 | namespace OpenSim.Data.NHibernate |
41 | { | 37 | { |
diff --git a/OpenSim/Data/NHibernate/SByteType.cs b/OpenSim/Data/NHibernate/SByteType.cs index 0d8431d..f41cb33 100644 --- a/OpenSim/Data/NHibernate/SByteType.cs +++ b/OpenSim/Data/NHibernate/SByteType.cs | |||
@@ -27,8 +27,6 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Data; | 29 | using System.Data; |
30 | using OpenMetaverse; | ||
31 | using OpenSim.Framework; | ||
32 | using NHibernate; | 30 | using NHibernate; |
33 | using NHibernate.SqlTypes; | 31 | using NHibernate.SqlTypes; |
34 | using NHibernate.UserTypes; | 32 | using NHibernate.UserTypes; |
diff --git a/OpenSim/Data/NHibernate/Terrain.cs b/OpenSim/Data/NHibernate/Terrain.cs index 88be17f..292b3b4 100644 --- a/OpenSim/Data/NHibernate/Terrain.cs +++ b/OpenSim/Data/NHibernate/Terrain.cs | |||
@@ -28,9 +28,9 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using OpenSim.Framework; | ||
32 | using log4net; | 31 | using log4net; |
33 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using OpenSim.Framework; | ||
34 | 34 | ||
35 | namespace OpenSim.Data.NHibernate | 35 | namespace OpenSim.Data.NHibernate |
36 | { | 36 | { |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs index d6c7f8f..8296556 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs | |||
@@ -26,15 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 29 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
35 | using OpenSim.Data.NHibernate; | ||
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | using OpenMetaverse; | ||
38 | 31 | ||
39 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
40 | { | 33 | { |
@@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
62 | } | 55 | } |
63 | catch (Exception e) | 56 | catch (Exception e) |
64 | { | 57 | { |
65 | System.Console.WriteLine("Exception {0}", e); | 58 | Console.WriteLine("Exception {0}", e); |
66 | Assert.Ignore(); | 59 | Assert.Ignore(); |
67 | } | 60 | } |
68 | } | 61 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs index e70b32b..9aa1ba8 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs | |||
@@ -26,15 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 29 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
35 | using OpenSim.Region.Framework.Scenes; | ||
36 | using OpenMetaverse; | ||
37 | using OpenSim.Data.NHibernate; | ||
38 | 31 | ||
39 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
40 | { | 33 | { |
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
61 | } | 54 | } |
62 | catch (Exception e) | 55 | catch (Exception e) |
63 | { | 56 | { |
64 | System.Console.WriteLine("Exception {0}", e); | 57 | Console.WriteLine("Exception {0}", e); |
65 | Assert.Ignore(); | 58 | Assert.Ignore(); |
66 | } | 59 | } |
67 | } | 60 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs index 7500574..c3c2c93 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs | |||
@@ -26,16 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 29 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
35 | using OpenSim.Data.NHibernate; | ||
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | using OpenMetaverse; | ||
38 | using log4net; | ||
39 | 31 | ||
40 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
41 | { | 33 | { |
@@ -62,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
62 | } | 54 | } |
63 | catch (Exception e) | 55 | catch (Exception e) |
64 | { | 56 | { |
65 | System.Console.WriteLine("Exception {0}", e); | 57 | Console.WriteLine("Exception {0}", e); |
66 | Assert.Ignore(); | 58 | Assert.Ignore(); |
67 | } | 59 | } |
68 | } | 60 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs index add8883..5cf0a5b 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs | |||
@@ -26,15 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 29 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
35 | using OpenSim.Data.NHibernate; | ||
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | using OpenMetaverse; | ||
38 | 31 | ||
39 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
40 | { | 33 | { |
@@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
62 | } | 55 | } |
63 | catch (Exception e) | 56 | catch (Exception e) |
64 | { | 57 | { |
65 | System.Console.WriteLine("Exception {0}", e); | 58 | Console.WriteLine("Exception {0}", e); |
66 | Assert.Ignore(); | 59 | Assert.Ignore(); |
67 | } | 60 | } |
68 | } | 61 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs index 01b0236..2b0da74 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs | |||
@@ -26,15 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 29 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
35 | using OpenSim.Data.NHibernate; | ||
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | using OpenMetaverse; | ||
38 | 31 | ||
39 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
40 | { | 33 | { |
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
61 | } | 54 | } |
62 | catch (Exception e) | 55 | catch (Exception e) |
63 | { | 56 | { |
64 | System.Console.WriteLine("Exception {0}", e); | 57 | Console.WriteLine("Exception {0}", e); |
65 | Assert.Ignore(); | 58 | Assert.Ignore(); |
66 | } | 59 | } |
67 | } | 60 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs index 93b92ed..96194c6 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs | |||
@@ -26,15 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 29 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
35 | using OpenSim.Data.NHibernate; | ||
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | using OpenMetaverse; | ||
38 | 31 | ||
39 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
40 | { | 33 | { |
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
61 | } | 54 | } |
62 | catch (Exception e) | 55 | catch (Exception e) |
63 | { | 56 | { |
64 | System.Console.WriteLine("Exception {0}", e); | 57 | Console.WriteLine("Exception {0}", e); |
65 | Assert.Ignore(); | 58 | Assert.Ignore(); |
66 | } | 59 | } |
67 | } | 60 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs index c845d2c..60b197c 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs | |||
@@ -26,15 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 29 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
35 | using OpenSim.Region.Framework.Scenes; | ||
36 | using OpenMetaverse; | ||
37 | using OpenSim.Data.NHibernate; | ||
38 | 31 | ||
39 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
40 | { | 33 | { |
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
61 | } | 54 | } |
62 | catch (Exception e) | 55 | catch (Exception e) |
63 | { | 56 | { |
64 | System.Console.WriteLine("Exception {0}", e); | 57 | Console.WriteLine("Exception {0}", e); |
65 | Assert.Ignore(); | 58 | Assert.Ignore(); |
66 | } | 59 | } |
67 | } | 60 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs index f91d058..8415fdf 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs | |||
@@ -26,16 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 29 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
35 | using OpenSim.Data.NHibernate; | ||
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | using OpenMetaverse; | ||
38 | using log4net; | ||
39 | 31 | ||
40 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
41 | { | 33 | { |
@@ -62,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
62 | } | 54 | } |
63 | catch (Exception e) | 55 | catch (Exception e) |
64 | { | 56 | { |
65 | System.Console.WriteLine("Exception {0}", e); | 57 | Console.WriteLine("Exception {0}", e); |
66 | Assert.Ignore(); | 58 | Assert.Ignore(); |
67 | } | 59 | } |
68 | } | 60 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs index 4db8375..89ab928 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs | |||
@@ -26,15 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 29 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
35 | using OpenSim.Data.NHibernate; | ||
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | using OpenMetaverse; | ||
38 | 31 | ||
39 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
40 | { | 33 | { |
@@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
62 | } | 55 | } |
63 | catch (Exception e) | 56 | catch (Exception e) |
64 | { | 57 | { |
65 | System.Console.WriteLine("Exception {0}", e); | 58 | Console.WriteLine("Exception {0}", e); |
66 | Assert.Ignore(); | 59 | Assert.Ignore(); |
67 | } | 60 | } |
68 | } | 61 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs index 3bc0f4b..a50df9b 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs | |||
@@ -26,15 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 29 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
35 | using OpenSim.Data.NHibernate; | ||
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | using OpenMetaverse; | ||
38 | 31 | ||
39 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
40 | { | 33 | { |
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
61 | } | 54 | } |
62 | catch (Exception e) | 55 | catch (Exception e) |
63 | { | 56 | { |
64 | System.Console.WriteLine("Exception {0}", e); | 57 | Console.WriteLine("Exception {0}", e); |
65 | Assert.Ignore(); | 58 | Assert.Ignore(); |
66 | } | 59 | } |
67 | } | 60 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs index 50632d1..33a36e6 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs | |||
@@ -26,14 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 29 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
35 | using OpenSim.Data.NHibernate; | ||
36 | using OpenMetaverse; | ||
37 | 31 | ||
38 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
39 | { | 33 | { |
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
60 | } | 54 | } |
61 | catch (Exception e) | 55 | catch (Exception e) |
62 | { | 56 | { |
63 | System.Console.WriteLine("Exception {0}", e); | 57 | Console.WriteLine("Exception {0}", e); |
64 | Assert.Ignore(); | 58 | Assert.Ignore(); |
65 | } | 59 | } |
66 | } | 60 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs index a6e9891..93f1ee1 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs | |||
@@ -26,14 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 29 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
35 | using OpenMetaverse; | ||
36 | using OpenSim.Data.NHibernate; | ||
37 | 31 | ||
38 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
39 | { | 33 | { |
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
60 | } | 54 | } |
61 | catch (Exception e) | 55 | catch (Exception e) |
62 | { | 56 | { |
63 | System.Console.WriteLine("Exception {0}", e); | 57 | Console.WriteLine("Exception {0}", e); |
64 | Assert.Ignore(); | 58 | Assert.Ignore(); |
65 | } | 59 | } |
66 | } | 60 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs index 057996b..afad336 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs | |||
@@ -26,15 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 29 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
35 | using OpenSim.Data.NHibernate; | ||
36 | using OpenMetaverse; | ||
37 | using log4net; | ||
38 | 31 | ||
39 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
40 | { | 33 | { |
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
61 | } | 54 | } |
62 | catch (Exception e) | 55 | catch (Exception e) |
63 | { | 56 | { |
64 | System.Console.WriteLine("Exception {0}", e); | 57 | Console.WriteLine("Exception {0}", e); |
65 | Assert.Ignore(); | 58 | Assert.Ignore(); |
66 | } | 59 | } |
67 | } | 60 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs index 4fc89f8..9967af7 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs | |||
@@ -26,14 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 29 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
35 | using OpenSim.Data.NHibernate; | ||
36 | using OpenMetaverse; | ||
37 | 31 | ||
38 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
39 | { | 33 | { |
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
60 | } | 54 | } |
61 | catch (Exception e) | 55 | catch (Exception e) |
62 | { | 56 | { |
63 | System.Console.WriteLine("Exception {0}", e); | 57 | Console.WriteLine("Exception {0}", e); |
64 | Assert.Ignore(); | 58 | Assert.Ignore(); |
65 | } | 59 | } |
66 | } | 60 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs index 1abf97b..0edfdcb 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs | |||
@@ -26,14 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 29 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
35 | using OpenSim.Data.NHibernate; | ||
36 | using OpenMetaverse; | ||
37 | 31 | ||
38 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
39 | { | 33 | { |
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
60 | } | 54 | } |
61 | catch (Exception e) | 55 | catch (Exception e) |
62 | { | 56 | { |
63 | System.Console.WriteLine("Exception {0}", e); | 57 | Console.WriteLine("Exception {0}", e); |
64 | Assert.Ignore(); | 58 | Assert.Ignore(); |
65 | } | 59 | } |
66 | } | 60 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs index 77bbb08..cc4915b 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs | |||
@@ -27,14 +27,8 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 30 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
35 | using OpenSim.Data.NHibernate; | ||
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | using OpenMetaverse; | ||
38 | 32 | ||
39 | namespace OpenSim.Data.NHibernate.Tests | 33 | namespace OpenSim.Data.NHibernate.Tests |
40 | { | 34 | { |
@@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
62 | } | 56 | } |
63 | catch (Exception e) | 57 | catch (Exception e) |
64 | { | 58 | { |
65 | System.Console.WriteLine("Exception {0}", e); | 59 | Console.WriteLine("Exception {0}", e); |
66 | Assert.Ignore(); | 60 | Assert.Ignore(); |
67 | } | 61 | } |
68 | } | 62 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs index 6e7d7af..a358b27 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs | |||
@@ -27,14 +27,8 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 30 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
35 | using OpenSim.Region.Framework.Scenes; | ||
36 | using OpenMetaverse; | ||
37 | using OpenSim.Data.NHibernate; | ||
38 | 32 | ||
39 | namespace OpenSim.Data.NHibernate.Tests | 33 | namespace OpenSim.Data.NHibernate.Tests |
40 | { | 34 | { |
@@ -61,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
61 | } | 55 | } |
62 | catch (Exception e) | 56 | catch (Exception e) |
63 | { | 57 | { |
64 | System.Console.WriteLine("Exception {0}", e); | 58 | Console.WriteLine("Exception {0}", e); |
65 | Assert.Ignore(); | 59 | Assert.Ignore(); |
66 | } | 60 | } |
67 | } | 61 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs index 45c77f7..297a661 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs | |||
@@ -27,15 +27,8 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 30 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
35 | using OpenSim.Data.NHibernate; | ||
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | using OpenMetaverse; | ||
38 | using log4net; | ||
39 | 32 | ||
40 | namespace OpenSim.Data.NHibernate.Tests | 33 | namespace OpenSim.Data.NHibernate.Tests |
41 | { | 34 | { |
@@ -63,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
63 | } | 56 | } |
64 | catch (Exception e) | 57 | catch (Exception e) |
65 | { | 58 | { |
66 | System.Console.WriteLine("Exception {0}", e); | 59 | Console.WriteLine("Exception {0}", e); |
67 | Assert.Ignore(); | 60 | Assert.Ignore(); |
68 | } | 61 | } |
69 | } | 62 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs index 6e84110..f188736 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs | |||
@@ -27,14 +27,8 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 30 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
35 | using OpenSim.Data.NHibernate; | ||
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | using OpenMetaverse; | ||
38 | 32 | ||
39 | namespace OpenSim.Data.NHibernate.Tests | 33 | namespace OpenSim.Data.NHibernate.Tests |
40 | { | 34 | { |
@@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
62 | } | 56 | } |
63 | catch (Exception e) | 57 | catch (Exception e) |
64 | { | 58 | { |
65 | System.Console.WriteLine("Exception {0}", e); | 59 | Console.WriteLine("Exception {0}", e); |
66 | Assert.Ignore(); | 60 | Assert.Ignore(); |
67 | } | 61 | } |
68 | } | 62 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs index 90edbc2..d94dac0 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs | |||
@@ -27,14 +27,8 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Collections.Generic; | ||
31 | using NUnit.Framework; | 30 | using NUnit.Framework; |
32 | using NUnit.Framework.SyntaxHelpers; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
35 | using OpenSim.Data.NHibernate; | ||
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | using OpenMetaverse; | ||
38 | 32 | ||
39 | namespace OpenSim.Data.NHibernate.Tests | 33 | namespace OpenSim.Data.NHibernate.Tests |
40 | { | 34 | { |
@@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests | |||
62 | } | 56 | } |
63 | catch (Exception e) | 57 | catch (Exception e) |
64 | { | 58 | { |
65 | System.Console.WriteLine("Exception {0}", e); | 59 | Console.WriteLine("Exception {0}", e); |
66 | Assert.Ignore(); | 60 | Assert.Ignore(); |
67 | } | 61 | } |
68 | } | 62 | } |
diff --git a/OpenSim/Data/NHibernate/TextureUserType.cs b/OpenSim/Data/NHibernate/TextureUserType.cs index ff949d4..57a580d 100644 --- a/OpenSim/Data/NHibernate/TextureUserType.cs +++ b/OpenSim/Data/NHibernate/TextureUserType.cs | |||
@@ -27,11 +27,11 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Data; | 29 | using System.Data; |
30 | using OpenMetaverse; | ||
31 | using OpenSim.Framework; | ||
32 | using NHibernate; | 30 | using NHibernate; |
33 | using NHibernate.SqlTypes; | 31 | using NHibernate.SqlTypes; |
34 | using NHibernate.UserTypes; | 32 | using NHibernate.UserTypes; |
33 | using OpenMetaverse; | ||
34 | using OpenSim.Framework; | ||
35 | 35 | ||
36 | namespace OpenSim.Data.NHibernate | 36 | namespace OpenSim.Data.NHibernate |
37 | { | 37 | { |
diff --git a/OpenSim/Data/NHibernate/UInt16Type.cs b/OpenSim/Data/NHibernate/UInt16Type.cs index b805288..907e832 100644 --- a/OpenSim/Data/NHibernate/UInt16Type.cs +++ b/OpenSim/Data/NHibernate/UInt16Type.cs | |||
@@ -27,8 +27,6 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Data; | 29 | using System.Data; |
30 | using OpenMetaverse; | ||
31 | using OpenSim.Framework; | ||
32 | using NHibernate; | 30 | using NHibernate; |
33 | using NHibernate.SqlTypes; | 31 | using NHibernate.SqlTypes; |
34 | using NHibernate.UserTypes; | 32 | using NHibernate.UserTypes; |
diff --git a/OpenSim/Data/NHibernate/UInt32Type.cs b/OpenSim/Data/NHibernate/UInt32Type.cs index 2500194..2b4c24a 100644 --- a/OpenSim/Data/NHibernate/UInt32Type.cs +++ b/OpenSim/Data/NHibernate/UInt32Type.cs | |||
@@ -27,8 +27,6 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Data; | 29 | using System.Data; |
30 | using OpenMetaverse; | ||
31 | using OpenSim.Framework; | ||
32 | using NHibernate; | 30 | using NHibernate; |
33 | using NHibernate.SqlTypes; | 31 | using NHibernate.SqlTypes; |
34 | using NHibernate.UserTypes; | 32 | using NHibernate.UserTypes; |
diff --git a/OpenSim/Data/NHibernate/UInt64Type.cs b/OpenSim/Data/NHibernate/UInt64Type.cs index 304c9371..362e62d 100644 --- a/OpenSim/Data/NHibernate/UInt64Type.cs +++ b/OpenSim/Data/NHibernate/UInt64Type.cs | |||
@@ -27,8 +27,6 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Data; | 29 | using System.Data; |
30 | using OpenMetaverse; | ||
31 | using OpenSim.Framework; | ||
32 | using NHibernate; | 30 | using NHibernate; |
33 | using NHibernate.SqlTypes; | 31 | using NHibernate.SqlTypes; |
34 | using NHibernate.UserTypes; | 32 | using NHibernate.UserTypes; |
diff --git a/OpenSim/Data/NHibernate/UserFriend.cs b/OpenSim/Data/NHibernate/UserFriend.cs index ab6cd78..589acd1 100644 --- a/OpenSim/Data/NHibernate/UserFriend.cs +++ b/OpenSim/Data/NHibernate/UserFriend.cs | |||
@@ -25,9 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using OpenMetaverse; | 28 | using OpenMetaverse; |
32 | 29 | ||
33 | namespace OpenSim.Data.NHibernate | 30 | namespace OpenSim.Data.NHibernate |