OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes mantis #2950

0.6.2-post-fixes
Justin Clarke Casey 2009-01-05 18:04:47 +00:00
parent 0b07c9762b
commit 0d3a99f6bc
6 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/NHibernate/NHibernateAssetData.cs
View File

@ -45,7 +45,7 @@ namespace OpenSim.Data.NHibernate
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private NHibernateManager manager; public NHibernateManager manager;
override public void Dispose() { } override public void Dispose() { }

2
OpenSim/Data/NHibernate/NHibernateInventoryData.cs
View File

@ -43,7 +43,7 @@ namespace OpenSim.Data.NHibernate
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private NHibernateManager manager; public NHibernateManager manager;
public void Initialise() public void Initialise()
{ {

6
OpenSim/Data/NHibernate/NHibernateManager.cs
View File

@ -151,6 +151,12 @@ namespace OpenSim.Data.NHibernate
return false; return false;
} }
public void DropSchema()
{
SchemaExport export = new SchemaExport(this.cfg);
export.Drop(true, true);
}
public ISession GetSession() public ISession GetSession()
{ {
return session; return session;

2
OpenSim/Data/NHibernate/NHibernateRegionData.cs
View File

@ -49,7 +49,7 @@ namespace OpenSim.Data.NHibernate
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private NHibernateManager manager; public NHibernateManager manager;
public void Initialise(string connect) public void Initialise(string connect)
{ {

2
OpenSim/Data/NHibernate/NHibernateUserData.cs
View File

@ -46,7 +46,7 @@ namespace OpenSim.Data.NHibernate
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private NHibernateManager manager; public NHibernateManager manager;
public override void Initialise() public override void Initialise()
{ {

43
prebuild.xml
View File

@ -1598,7 +1598,9 @@
<Reference name="log4net.dll"/> <Reference name="log4net.dll"/>
<Files> <Files>
<Match pattern="*.cs" recurse="true"/> <Match pattern="*.cs" recurse="true" >
<Exclude name="Tests" pattern="Tests" />
</Match>
<Match path="Resources" pattern="*.xml" buildAction="EmbeddedResource"/> <Match path="Resources" pattern="*.xml" buildAction="EmbeddedResource"/>
<Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/> <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
<!-- add more as you go --> <!-- add more as you go -->
@ -2540,6 +2542,45 @@
</Files> </Files>
</Project> </Project>
<Project name="OpenSim.Data.NHibernate.Tests" path="OpenSim/Data/NHibernate/Tests" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
</Options>
</Configuration>
<Configuration name="Release">
<Options>
<OutputPath>../../../../bin/</OutputPath>
</Options>
</Configuration>
<ReferencePath>../../../../bin/</ReferencePath>
<Reference name="System" localCopy="false"/>
<Reference name="System.Xml"/>
<Reference name="System.Data"/>
<Reference name="System.Drawing"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Data"/>
<Reference name="OpenSim.Data.MapperFactory"/>
<Reference name="OpenSim.Data.Base"/>
<Reference name="OpenSim.Data.NHibernate"/>
<Reference name="OpenSim.Data.Tests"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Region.Environment"/>
<Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.dll"/>
<Reference name="MySql.Data.dll"/>
<Reference name="System.Data.SQLite.dll" />
<Reference name="log4net.dll"/>
<Reference name="nunit.framework.dll" />
<Reference name="NHibernate.dll"/>
<Reference name="Mono.Addins.dll" />
<Files>
<Match pattern="*.cs" recurse="true"/>
</Files>
</Project>
<Project name="OpenSim.Data.SQLite.Tests" path="OpenSim/Data/SQLite/Tests" type="Library"> <Project name="OpenSim.Data.SQLite.Tests" path="OpenSim/Data/SQLite/Tests" type="Library">
<Configuration name="Debug"> <Configuration name="Debug">
<Options> <Options>