* some more refactoring + bugfix

4 files changed, 134 insertions, 126 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs
index a374df2..b17f65a 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs
@@ -1,29 +1,29 @@
-/*
-* Copyright (c) Contributors, http://opensimulator.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+/*

+* Copyright (c) Contributors, http://opensimulator.org/

+* See CONTRIBUTORS.TXT for a full list of copyright holders.

+*

+* Redistribution and use in source and binary forms, with or without

+* modification, are permitted provided that the following conditions are met:

+*     * Redistributions of source code must retain the above copyright

+*       notice, this list of conditions and the following disclaimer.

+*     * Redistributions in binary form must reproduce the above copyright

+*       notice, this list of conditions and the following disclaimer in the

+*       documentation and/or other materials provided with the distribution.

+*     * Neither the name of the OpenSim Project nor the

+*       names of its contributors may be used to endorse or promote products

+*       derived from this software without specific prior written permission.

+*

+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+* 

 */

 using System;

 using System.Collections.Generic;

@@ -57,11 +57,6 @@ namespace OpenSim.Framework.Communications.Cache
             {

                 SetUpAssetDatabase();

             }

-

-            this._localAssetServerThread = new Thread(new ThreadStart(RunRequests));

-            this._localAssetServerThread.IsBackground = true;

-            this._localAssetServerThread.Start();

-

         }

 

         public void CreateAndCommitAsset(AssetBase asset)

@@ -76,6 +71,8 @@ namespace OpenSim.Framework.Communications.Cache
 

         override public void Close()

         {

+            base.Close();

+

             if (db != null)

             {

                 MainLog.Instance.Verbose("Closing local asset server database");

@@ -83,7 +80,7 @@ namespace OpenSim.Framework.Communications.Cache
             }

         }

 

-        private void RunRequests()

+        override  protected void RunRequests()

         {

             while (true)

             {

@@ -135,12 +132,12 @@ namespace OpenSim.Framework.Communications.Cache
             db.Commit();

         }

 

-        private void SetUpAssetDatabase()

+        protected virtual void SetUpAssetDatabase()

         {

             MainLog.Instance.Verbose("LOCAL ASSET SERVER", "Setting up asset database");

 

-            ForEachDefaultAsset(this, StoreAsset);

-            ForEachXmlAsset(this, StoreAsset);

+            ForEachDefaultAsset(StoreAsset);

+            ForEachXmlAsset(StoreAsset);

         }

     }

 

diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 7073000..858019f 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -22,78 +22,27 @@ namespace OpenSim.Framework.Communications.Cache
         protected abstract void StoreAsset(AssetBase asset);

         protected abstract void CommitAssets();

 

+        protected abstract void RunRequests();

+ 

         public void LoadDefaultAssets()

         {

             MainLog.Instance.Verbose("SQL ASSET SERVER", "Setting up asset database");

 

-            ForEachDefaultAsset( this, StoreAsset );

-            ForEachXmlAsset( this, StoreAsset );

+            ForEachDefaultAsset(StoreAsset );

+            ForEachXmlAsset(StoreAsset );

 

             CommitAssets();

         }

 

 

-        public static AssetBase CreateAsset(IAssetServer assetServer, string assetIdStr, string name, string filename, bool isImage)

-        {

-            AssetBase asset = new AssetBase(

-                new LLUUID(assetIdStr),

-                name

-                );

-

-            if (!String.IsNullOrEmpty(filename))

-            {

-                MainLog.Instance.Verbose("ASSETS", "Loading: [{0}][{1}]", name, filename );

-

-                assetServer.LoadAsset(asset, isImage, filename);

-            }

-            else

-            {

-                MainLog.Instance.Verbose("ASSETS", "Instantiated: [{0}]", name );                

-            }

-

-            return asset;

-        }

-

-        private static AssetBase CreateImageAsset(IAssetServer assetServer, string assetIdStr, string name, string filename)

-        {

-            return CreateAsset(assetServer, assetIdStr, name, filename, true);

-        }

-

-        public static List<AssetBase> GetDefaultAssets(IAssetServer assetServer)

-        {

-            List<AssetBase> assets = new List<AssetBase>();

-

-            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000001", "Bricks", "bricks.jp2"));

-            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000002", "Plywood", "plywood.jp2"));

-            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000003", "Rocks", "rocks.jp2"));

-            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000004", "Granite", "granite.jp2"));

-            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000005", "Hardwood", "hardwood.jp2"));

-            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-5005-000000000005", "Prim Base Texture", "plywood.jp2"));

-            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000006", "Map Base Texture", "map_base.jp2"));

-            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000007", "Map Texture", "map1.jp2"));

-            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000010", "Female Body Texture", "femalebody.jp2"));

-            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000011", "Female Bottom Texture", "femalebottom.jp2"));

-            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000012", "Female Face Texture", "femaleface.jp2"));

-            assets.Add(CreateImageAsset(assetServer, "00000000-0000-0000-9999-000000000001", "Bricks", "bricks.jp2"));

-

-            assets.Add(CreateAsset(assetServer, "77c41e39-38f9-f75a-024e-585989bbabbb", "Skin", "base_skin.dat", false));

-            assets.Add(CreateAsset(assetServer, "66c41e39-38f9-f75a-024e-585989bfab73", "Shape", "base_shape.dat", false));

-            assets.Add(CreateAsset(assetServer, "00000000-38f9-1111-024e-222222111110", "Shirt", "newshirt.dat", false));

-            assets.Add(CreateAsset(assetServer, "00000000-38f9-1111-024e-222222111120", "Shirt", "newpants.dat", false));

-

-            return assets;

-        }

-

-        public static void ForEachDefaultAsset(IAssetServer assetServer, Action<AssetBase> action)

-        {

-            List<AssetBase> assets = GetDefaultAssets(assetServer);

-            assets.ForEach(action);

-        }

-

         public AssetServerBase()

         {

             System.Console.WriteLine("Starting Db4o asset storage system");            

             this._assetRequests = new BlockingQueue<ARequest>();

+

+            this._localAssetServerThread = new Thread( RunRequests );

+            this._localAssetServerThread.IsBackground = true;

+            this._localAssetServerThread.Start();

         }

 

         public void LoadAsset(AssetBase info, bool image, string filename)

@@ -115,30 +64,6 @@ namespace OpenSim.Framework.Communications.Cache
             //info.loaded=true;

         }

 

-        public static void ForEachXmlAsset(IAssetServer assetServer, Action<AssetBase> action)

-        {

-            string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml");

-            if (File.Exists(filePath))

-            {

-                XmlConfigSource source = new XmlConfigSource(filePath);

-

-                for (int i = 0; i < source.Configs.Count; i++)

-                {

-                    string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated());

-                    string name = source.Configs[i].GetString("name", "");

-                    sbyte type = (sbyte)source.Configs[i].GetInt("assetType", 0);

-                    sbyte invType = (sbyte)source.Configs[i].GetInt("inventoryType", 0);

-                    string fileName = source.Configs[i].GetString("fileName", "");

-

-                    AssetBase newAsset = CreateAsset(assetServer, assetIdStr, name, fileName, false);

-

-                    newAsset.Type = type;

-                    newAsset.InvType = invType;

-

-                }

-            }

-        }

-

         public void SetReceiver(IAssetReceiver receiver)

         {

             this._receiver = receiver;

@@ -170,11 +95,94 @@ namespace OpenSim.Framework.Communications.Cache
             }

         }

 

+        public virtual void Close()

+    {

+        _localAssetServerThread.Abort( );

+    }

+

         public void SetServerInfo(string ServerUrl, string ServerKey)

         {

            

         }

 

-        public abstract void Close();

+        public virtual List<AssetBase> GetDefaultAssets()

+        {

+            List<AssetBase> assets = new List<AssetBase>();

+

+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000001", "Bricks", "bricks.jp2"));

+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000002", "Plywood", "plywood.jp2"));

+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000003", "Rocks", "rocks.jp2"));

+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000004", "Granite", "granite.jp2"));

+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000005", "Hardwood", "hardwood.jp2"));

+            assets.Add(CreateImageAsset("00000000-0000-0000-5005-000000000005", "Prim Base Texture", "plywood.jp2"));

+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000006", "Map Base Texture", "map_base.jp2"));

+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000007", "Map Texture", "map1.jp2"));

+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000010", "Female Body Texture", "femalebody.jp2"));

+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000011", "Female Bottom Texture", "femalebottom.jp2"));

+            assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000012", "Female Face Texture", "femaleface.jp2"));

+

+            assets.Add(CreateAsset("77c41e39-38f9-f75a-024e-585989bbabbb", "Skin", "base_skin.dat", false));

+            assets.Add(CreateAsset("66c41e39-38f9-f75a-024e-585989bfab73", "Shape", "base_shape.dat", false));

+            assets.Add(CreateAsset("00000000-38f9-1111-024e-222222111110", "Shirt", "newshirt.dat", false));

+            assets.Add(CreateAsset("00000000-38f9-1111-024e-222222111120", "Shirt", "newpants.dat", false));

+

+            return assets;

+        }

+

+        public AssetBase CreateImageAsset(string assetIdStr, string name, string filename)

+        {

+            return CreateAsset(assetIdStr, name, filename, true);

+        }

+

+        public void ForEachDefaultAsset(Action<AssetBase> action)

+        {

+            List<AssetBase> assets = GetDefaultAssets();

+            assets.ForEach(action);

+        }

+

+        public AssetBase CreateAsset(string assetIdStr, string name, string filename, bool isImage)

+        {

+            AssetBase asset = new AssetBase(

+                new LLUUID(assetIdStr),

+                name

+                );

+

+            if (!String.IsNullOrEmpty(filename))

+            {

+                MainLog.Instance.Verbose("ASSETS", "Loading: [{0}][{1}]", name, filename );

+

+                LoadAsset(asset, isImage, filename);

+            }

+            else

+            {

+                MainLog.Instance.Verbose("ASSETS", "Instantiated: [{0}]", name );                

+            }

+

+            return asset;

+        }

+

+        public void ForEachXmlAsset(Action<AssetBase> action)

+        {

+            string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml");

+            if (File.Exists(filePath))

+            {

+                XmlConfigSource source = new XmlConfigSource(filePath);

+

+                for (int i = 0; i < source.Configs.Count; i++)

+                {

+                    string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated());

+                    string name = source.Configs[i].GetString("name", "");

+                    sbyte type = (sbyte)source.Configs[i].GetInt("assetType", 0);

+                    sbyte invType = (sbyte)source.Configs[i].GetInt("inventoryType", 0);

+                    string fileName = source.Configs[i].GetString("fileName", "");

+

+                    AssetBase newAsset = CreateAsset(assetIdStr, name, fileName, false);

+

+                    newAsset.Type = type;

+                    newAsset.InvType = invType;

+

+                }

+            }

+        }

     }

 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index cf54b81..379d609 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -44,11 +44,6 @@ namespace OpenSim.Framework.Communications.Cache
         {

             _assetRequests = new BlockingQueue<ARequest>();

             AddPlugin(pluginName);

-

-            this._localAssetServerThread = new Thread(new ThreadStart(RunRequests));

-            this._localAssetServerThread.IsBackground = true;

-            this._localAssetServerThread.Start();

-

         }

 

         public SQLAssetServer(IAssetProvider assetProvider)

@@ -86,12 +81,13 @@ namespace OpenSim.Framework.Communications.Cache
 

         public override void Close()

         {

+            base.Close();

+

             m_assetProviderPlugin.CommitAssets();

         }

 

-        private void RunRequests()

+        override protected void RunRequests()

         {

-

             while (true)

             {

                 ARequest req = this._assetRequests.Dequeue();

diff --git a/OpenSim/Framework/General/Interfaces/IAssetServer.cs b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
index e7401eb..e615bf8 100644
--- a/OpenSim/Framework/General/Interfaces/IAssetServer.cs
+++ b/OpenSim/Framework/General/Interfaces/IAssetServer.cs
@@ -25,6 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
+using System;
+using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework.Types;
 
@@ -43,6 +45,11 @@ namespace OpenSim.Framework.Interfaces
         void SetServerInfo(string ServerUrl, string ServerKey);
         void Close();
         void LoadAsset(AssetBase info, bool image, string filename);
+        List<AssetBase> GetDefaultAssets();
+        AssetBase CreateImageAsset(string assetIdStr, string name, string filename);
+        void ForEachDefaultAsset(Action<AssetBase> action);
+        AssetBase CreateAsset(string assetIdStr, string name, string filename, bool isImage);
+        void ForEachXmlAsset(Action<AssetBase> action);
     }
 
     // could change to delegate?