diff options
Diffstat (limited to 'OpenSim/Data/NHibernate/NHibernateAssetData.cs')
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateAssetData.cs | 14 |
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 | ||
28 | using System; | 28 | using System; |
29 | using System.Data; | 29 | using System.IO; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | using log4net; | ||
32 | using NHibernate; | 33 | using NHibernate; |
33 | using NHibernate.Cfg; | 34 | using NHibernate.Cfg; |
34 | using NHibernate.Tool.hbm2ddl; | ||
35 | using NHibernate.Mapping.Attributes; | 35 | using NHibernate.Mapping.Attributes; |
36 | using OpenSim.Data; | ||
37 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Console; | 37 | using Environment=NHibernate.Cfg.Environment; |
39 | using Environment = NHibernate.Cfg.Environment; | ||
40 | 38 | ||
41 | namespace OpenSim.Data.NHibernate | 39 | namespace 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); |