diff options
Diffstat (limited to 'OpenSim/Data/NHibernate/NHibernateInventoryData.cs')
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateInventoryData.cs | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs index a004e29..1ac0f0c 100644 --- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs +++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs | |||
@@ -26,25 +26,23 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Data; | ||
30 | using System.Reflection; | ||
31 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | ||
31 | using System.Reflection; | ||
32 | using libsecondlife; | 32 | using libsecondlife; |
33 | using log4net; | ||
33 | using NHibernate; | 34 | using NHibernate; |
34 | using NHibernate.Expression; | ||
35 | using NHibernate.Cfg; | 35 | using NHibernate.Cfg; |
36 | using NHibernate.Tool.hbm2ddl; | 36 | using NHibernate.Expression; |
37 | using NHibernate.Mapping.Attributes; | 37 | using NHibernate.Mapping.Attributes; |
38 | using OpenSim.Data; | ||
39 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
40 | using OpenSim.Framework.Console; | 39 | using Environment=NHibernate.Cfg.Environment; |
41 | using Environment = NHibernate.Cfg.Environment; | ||
42 | 40 | ||
43 | namespace OpenSim.Data.NHibernate | 41 | namespace OpenSim.Data.NHibernate |
44 | { | 42 | { |
45 | public class NHibernateInventoryData: IInventoryData | 43 | public class NHibernateInventoryData: IInventoryData |
46 | { | 44 | { |
47 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 46 | ||
49 | private Configuration cfg; | 47 | private Configuration cfg; |
50 | private ISessionFactory factory; | 48 | private ISessionFactory factory; |
@@ -74,8 +72,8 @@ namespace OpenSim.Data.NHibernate | |||
74 | cfg.AddAssembly("OpenSim.Data.NHibernate"); | 72 | cfg.AddAssembly("OpenSim.Data.NHibernate"); |
75 | 73 | ||
76 | HbmSerializer.Default.Validate = true; | 74 | HbmSerializer.Default.Validate = true; |
77 | using ( System.IO.MemoryStream stream = | 75 | using ( MemoryStream stream = |
78 | HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly())) | 76 | HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly())) |
79 | cfg.AddInputStream(stream); | 77 | cfg.AddInputStream(stream); |
80 | 78 | ||
81 | // new SchemaExport(cfg).Create(true, true); | 79 | // new SchemaExport(cfg).Create(true, true); |