aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-05 18:04:47 +0000
committerJustin Clarke Casey2009-01-05 18:04:47 +0000
commit0d3a99f6bc1c0f291d242407d67239f09cf49a7c (patch)
treee1361b5f8b2492605578927c6022f22f8067383e
parent* Simplify test code by always setting up mock 'in memory' user and inventory... (diff)
downloadopensim-SC_OLD-0d3a99f6bc1c0f291d242407d67239f09cf49a7c.zip
opensim-SC_OLD-0d3a99f6bc1c0f291d242407d67239f09cf49a7c.tar.gz
opensim-SC_OLD-0d3a99f6bc1c0f291d242407d67239f09cf49a7c.tar.bz2
opensim-SC_OLD-0d3a99f6bc1c0f291d242407d67239f09cf49a7c.tar.xz
fixes mantis #2950
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/NHibernate/NHibernateAssetData.cs2
-rw-r--r--OpenSim/Data/NHibernate/NHibernateInventoryData.cs2
-rw-r--r--OpenSim/Data/NHibernate/NHibernateManager.cs6
-rw-r--r--OpenSim/Data/NHibernate/NHibernateRegionData.cs2
-rw-r--r--OpenSim/Data/NHibernate/NHibernateUserData.cs2
-rw-r--r--prebuild.xml43
6 files changed, 52 insertions, 5 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index e1d074f..fab39b1 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Data.NHibernate
45 { 45 {
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 47
48 private NHibernateManager manager; 48 public NHibernateManager manager;
49 49
50 override public void Dispose() { } 50 override public void Dispose() { }
51 51
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index f7de8eb..dc98d11 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Data.NHibernate
43 { 43 {
44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45
46 private NHibernateManager manager; 46 public NHibernateManager manager;
47 47
48 public void Initialise() 48 public void Initialise()
49 { 49 {
diff --git a/OpenSim/Data/NHibernate/NHibernateManager.cs b/OpenSim/Data/NHibernate/NHibernateManager.cs
index 46840ac..12d8959 100644
--- a/OpenSim/Data/NHibernate/NHibernateManager.cs
+++ b/OpenSim/Data/NHibernate/NHibernateManager.cs
@@ -151,6 +151,12 @@ namespace OpenSim.Data.NHibernate
151 return false; 151 return false;
152 } 152 }
153 153
154 public void DropSchema()
155 {
156 SchemaExport export = new SchemaExport(this.cfg);
157 export.Drop(true, true);
158 }
159
154 public ISession GetSession() 160 public ISession GetSession()
155 { 161 {
156 return session; 162 return session;
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index 0aba58c..871013b 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Data.NHibernate
49 { 49 {
50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
51 51
52 private NHibernateManager manager; 52 public NHibernateManager manager;
53 53
54 public void Initialise(string connect) 54 public void Initialise(string connect)
55 { 55 {
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index ee0d2b8..e0f6db7 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Data.NHibernate
46 { 46 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 48
49 private NHibernateManager manager; 49 public NHibernateManager manager;
50 50
51 public override void Initialise() 51 public override void Initialise()
52 { 52 {
diff --git a/prebuild.xml b/prebuild.xml
index cebb57c..b2e56a6 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1598,7 +1598,9 @@
1598 <Reference name="log4net.dll"/> 1598 <Reference name="log4net.dll"/>
1599 1599
1600 <Files> 1600 <Files>
1601 <Match pattern="*.cs" recurse="true"/> 1601 <Match pattern="*.cs" recurse="true" >
1602 <Exclude name="Tests" pattern="Tests" />
1603 </Match>
1602 <Match path="Resources" pattern="*.xml" buildAction="EmbeddedResource"/> 1604 <Match path="Resources" pattern="*.xml" buildAction="EmbeddedResource"/>
1603 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/> 1605 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
1604 <!-- add more as you go --> 1606 <!-- add more as you go -->
@@ -2540,6 +2542,45 @@
2540 </Files> 2542 </Files>
2541 </Project> 2543 </Project>
2542 2544
2545 <Project name="OpenSim.Data.NHibernate.Tests" path="OpenSim/Data/NHibernate/Tests" type="Library">
2546 <Configuration name="Debug">
2547 <Options>
2548 <OutputPath>../../../../bin/</OutputPath>
2549 </Options>
2550 </Configuration>
2551 <Configuration name="Release">
2552 <Options>
2553 <OutputPath>../../../../bin/</OutputPath>
2554 </Options>
2555 </Configuration>
2556
2557 <ReferencePath>../../../../bin/</ReferencePath>
2558 <Reference name="System" localCopy="false"/>
2559 <Reference name="System.Xml"/>
2560 <Reference name="System.Data"/>
2561 <Reference name="System.Drawing"/>
2562 <Reference name="OpenSim.Framework"/>
2563 <Reference name="OpenSim.Data"/>
2564 <Reference name="OpenSim.Data.MapperFactory"/>
2565 <Reference name="OpenSim.Data.Base"/>
2566 <Reference name="OpenSim.Data.NHibernate"/>
2567 <Reference name="OpenSim.Data.Tests"/>
2568 <Reference name="OpenSim.Framework.Console"/>
2569 <Reference name="OpenSim.Region.Environment"/>
2570 <Reference name="OpenMetaverseTypes.dll"/>
2571 <Reference name="OpenMetaverse.dll"/>
2572 <Reference name="MySql.Data.dll"/>
2573 <Reference name="System.Data.SQLite.dll" />
2574 <Reference name="log4net.dll"/>
2575 <Reference name="nunit.framework.dll" />
2576 <Reference name="NHibernate.dll"/>
2577 <Reference name="Mono.Addins.dll" />
2578
2579 <Files>
2580 <Match pattern="*.cs" recurse="true"/>
2581 </Files>
2582 </Project>
2583
2543 <Project name="OpenSim.Data.SQLite.Tests" path="OpenSim/Data/SQLite/Tests" type="Library"> 2584 <Project name="OpenSim.Data.SQLite.Tests" path="OpenSim/Data/SQLite/Tests" type="Library">
2544 <Configuration name="Debug"> 2585 <Configuration name="Debug">
2545 <Options> 2586 <Options>