aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/NHibernate/NHibernateAssetData.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/NHibernate/NHibernateAssetData.cs')
-rw-r--r--OpenSim/Data/NHibernate/NHibernateAssetData.cs14
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index cc018dd..db90d09 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -26,17 +26,15 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Data; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net;
32using NHibernate; 33using NHibernate;
33using NHibernate.Cfg; 34using NHibernate.Cfg;
34using NHibernate.Tool.hbm2ddl;
35using NHibernate.Mapping.Attributes; 35using NHibernate.Mapping.Attributes;
36using OpenSim.Data;
37using OpenSim.Framework; 36using OpenSim.Framework;
38using OpenSim.Framework.Console; 37using Environment=NHibernate.Cfg.Environment;
39using Environment = NHibernate.Cfg.Environment;
40 38
41namespace OpenSim.Data.NHibernate 39namespace OpenSim.Data.NHibernate
42{ 40{
@@ -45,7 +43,7 @@ namespace OpenSim.Data.NHibernate
45 /// </summary> 43 /// </summary>
46 public class NHibernateAssetData : AssetDataBase, IDisposable 44 public class NHibernateAssetData : AssetDataBase, IDisposable
47 { 45 {
48 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
49 47
50 private Configuration cfg; 48 private Configuration cfg;
51 private ISessionFactory factory; 49 private ISessionFactory factory;
@@ -67,8 +65,8 @@ namespace OpenSim.Data.NHibernate
67 cfg.AddAssembly("OpenSim.Data.NHibernate"); 65 cfg.AddAssembly("OpenSim.Data.NHibernate");
68 66
69 HbmSerializer.Default.Validate = true; 67 HbmSerializer.Default.Validate = true;
70 using ( System.IO.MemoryStream stream = 68 using ( MemoryStream stream =
71 HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly())) 69 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
72 cfg.AddInputStream(stream); 70 cfg.AddInputStream(stream);
73 71
74 // new SchemaExport(cfg).Create(true, true); 72 // new SchemaExport(cfg).Create(true, true);