diff options
Diffstat (limited to 'OpenSim/Data/NHibernate/NHibernateUserData.cs')
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateUserData.cs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs index 0bbebaa..c0fe26c 100644 --- a/OpenSim/Data/NHibernate/NHibernateUserData.cs +++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs | |||
@@ -25,20 +25,16 @@ | |||
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.Data; | ||
30 | using System.Reflection; | ||
31 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.IO; | ||
30 | using System.Reflection; | ||
32 | using libsecondlife; | 31 | using libsecondlife; |
32 | using log4net; | ||
33 | using NHibernate; | 33 | using NHibernate; |
34 | using NHibernate.Cfg; | 34 | using NHibernate.Cfg; |
35 | using NHibernate.Expression; | 35 | using NHibernate.Expression; |
36 | using NHibernate.Tool.hbm2ddl; | ||
37 | using NHibernate.Mapping.Attributes; | 36 | using NHibernate.Mapping.Attributes; |
38 | using OpenSim.Data; | ||
39 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
40 | using OpenSim.Framework.Console; | ||
41 | using Environment = NHibernate.Cfg.Environment; | ||
42 | 38 | ||
43 | namespace OpenSim.Data.NHibernate | 39 | namespace OpenSim.Data.NHibernate |
44 | { | 40 | { |
@@ -47,7 +43,7 @@ namespace OpenSim.Data.NHibernate | |||
47 | /// </summary> | 43 | /// </summary> |
48 | public class NHibernateUserData : UserDataBase | 44 | public class NHibernateUserData : UserDataBase |
49 | { | 45 | { |
50 | 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); |
51 | 47 | ||
52 | private Configuration cfg; | 48 | private Configuration cfg; |
53 | private ISessionFactory factory; | 49 | private ISessionFactory factory; |
@@ -69,8 +65,8 @@ namespace OpenSim.Data.NHibernate | |||
69 | cfg.AddAssembly("OpenSim.Data.NHibernate"); | 65 | cfg.AddAssembly("OpenSim.Data.NHibernate"); |
70 | 66 | ||
71 | HbmSerializer.Default.Validate = true; | 67 | HbmSerializer.Default.Validate = true; |
72 | using ( System.IO.MemoryStream stream = | 68 | using ( MemoryStream stream = |
73 | HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly())) | 69 | HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly())) |
74 | cfg.AddInputStream(stream); | 70 | cfg.AddInputStream(stream); |
75 | 71 | ||
76 | // new SchemaExport(cfg).Create(true, true); | 72 | // new SchemaExport(cfg).Create(true, true); |