From 76c0935ec744f2d230489398f879eb7f42b11d37 Mon Sep 17 00:00:00 2001
From: Mike Mazur
Date: Tue, 17 Feb 2009 01:36:44 +0000
Subject: - remove the Metadata property from AssetBase and return all previous
   properties as before - prefix private variables with m_ in AssetBase.cs -
 related to Mantis #3122, as mentioned in  
 https://lists.berlios.de/pipermail/opensim-dev/2009-February/005088.html -
 all services will likely need to be upgraded after this commit

---
 OpenSim/Data/NHibernate/NHibernateAssetData.cs      |  6 +++---
 OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml | 18 ++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'OpenSim/Data/NHibernate')

diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index 8f4877d..95595db 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Data.NHibernate
 
         private void Save(AssetBase asset)
         {
-            AssetBase temp = (AssetBase)manager.Get(typeof(AssetBase), asset.Metadata.FullID);
+            AssetBase temp = (AssetBase)manager.Get(typeof(AssetBase), asset.FullID);
             if (temp == null)
             {
                 manager.Insert(asset);
@@ -73,13 +73,13 @@ namespace OpenSim.Data.NHibernate
 
         override public void CreateAsset(AssetBase asset)
         {
-            m_log.InfoFormat("[NHIBERNATE] inserting asset {0}", asset.Metadata.FullID);
+            m_log.InfoFormat("[NHIBERNATE] inserting asset {0}", asset.FullID);
             Save(asset);
         }
 
         override public void UpdateAsset(AssetBase asset)
         {
-            m_log.InfoFormat("[NHIBERNATE] updating asset {0}", asset.Metadata.FullID);
+            m_log.InfoFormat("[NHIBERNATE] updating asset {0}", asset.FullID);
             manager.Update(asset);
         }
 
diff --git a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
index db400ea..cb8b36d 100644
--- a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
     <class name="OpenSim.Framework.AssetBase, OpenSim.Framework" table="Assets" lazy="false">
-        <id name="FullID" column="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
-            <generator class="assigned" /> 
-        </id> 
+        <id name="FullID" column="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
+            <generator class="assigned" />
+        </id>
+        <property name="Type" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" />
+        <property name="Name" type="String" length="64" />
+        <property name="Description" type="String" length="64" />
+        <property name="Local" type="boolean" />
+        <property name="Temporary" type="boolean" />
         <property name="Data" type="binary" />
-        <component name="Metadata">
-            <property name="Type" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" />
-            <property name="Name" type="String" length="64" />
-            <property name="Description" type="String" length="64" />
-            <property name="Local" type="boolean" />
-            <property name="Temporary" type="boolean" />
-        </component>
     </class>
 </hibernate-mapping>
-- 
cgit v1.1