4 files changed, 75 insertions, 12 deletions

diff --git a/OpenSim/Grid/AssetInventoryServer/Extensions/BrowseFrontend.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs
index 8c70144..f445b97 100644
--- a/OpenSim/Grid/AssetInventoryServer/Extensions/BrowseFrontend.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs
@@ -33,32 +33,58 @@ using System.Collections.Specialized;
 using System.Net;
 using System.Text;
 using System.Web;
-using ExtensionLoader;
 using OpenMetaverse;
 using HttpServer;
+using OpenSim.Framework;
 
-namespace OpenSim.Grid.AssetInventoryServer.Extensions
+namespace OpenSim.Grid.AssetInventoryServer.Plugins
 {
-    public class BrowseFrontend : IExtension<AssetInventoryServer>
+    public class BrowseFrontendPlugin : IAssetInventoryServerPlugin
     {
         AssetInventoryServer server;
 
-        public BrowseFrontend()
+        public BrowseFrontendPlugin()
         {
         }
 
-        public void Start(AssetInventoryServer server)
+        #region IPlugin implementation
+
+        public void Initialise(AssetInventoryServer server)
         {
             this.server = server;
 
             // Request for / or /?...
             server.HttpServer.AddHandler("get", null, @"(^/$)|(^/\?.*)", BrowseRequestHandler);
+
+            Logger.Log.Info("[ASSET] Browser Frontend loaded.");
+        }
+
+        /// <summary>
+        /// <para>Initialises asset interface</para>
+        /// </summary>
+        public void Initialise()
+        {
+            Logger.Log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name);
+            throw new PluginNotInitialisedException(Name);
+        }
+
+        public void Dispose()
+        {
+        }
+
+        public string Version
+        {
+            // TODO: this should be something meaningful and not hardcoded?
+            get { return "0.1"; }
         }
 
-        public void Stop()
+        public string Name
         {
+            get { return "AssetInventoryServer Browse asset frontend"; }
         }
 
+        #endregion IPlugin implementation
+
         bool BrowseRequestHandler(IHttpClientContext client, IHttpRequest request, IHttpResponse response)
         {
             const int ASSETS_PER_PAGE = 25;
diff --git a/OpenSim/Grid/AssetInventoryServer/Extensions/ReferenceFrontend.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
index df6bd95..fddc385 100644
--- a/OpenSim/Grid/AssetInventoryServer/Extensions/ReferenceFrontend.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
@@ -31,22 +31,24 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Xml;
-using ExtensionLoader;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using HttpServer;
+using OpenSim.Framework;
 
-namespace OpenSim.Grid.AssetInventoryServer.Extensions
+namespace OpenSim.Grid.AssetInventoryServer.Plugins
 {
-    public class ReferenceFrontend : IExtension<AssetInventoryServer>
+    public class ReferenceFrontendPlugin : IAssetInventoryServerPlugin
     {
         AssetInventoryServer server;
 
-        public ReferenceFrontend()
+        public ReferenceFrontendPlugin()
         {
         }
 
-        public void Start(AssetInventoryServer server)
+        #region IPlugin implementation
+
+        public void Initialise(AssetInventoryServer server)
         {
             this.server = server;
 
@@ -60,12 +62,36 @@ namespace OpenSim.Grid.AssetInventoryServer.Extensions
 
             // Asset creation
             server.HttpServer.AddHandler("post", null, "^/createasset", CreateRequestHandler);
+
+            Logger.Log.Info("[ASSET] Reference Frontend loaded.");
+        }
+
+        /// <summary>
+        /// <para>Initialises asset interface</para>
+        /// </summary>
+        public void Initialise()
+        {
+            Logger.Log.InfoFormat("[ASSET]: {0} cannot be default-initialized!", Name);
+            throw new PluginNotInitialisedException(Name);
+        }
+
+        public void Dispose()
+        {
+        }
+
+        public string Version
+        {
+            // TODO: this should be something meaningful and not hardcoded?
+            get { return "0.1"; }
         }
 
-        public void Stop()
+        public string Name
         {
+            get { return "AssetInventoryServer Reference asset frontend"; }
         }
 
+        #endregion IPlugin implementation
+
         bool MetadataRequestHandler(IHttpClientContext client, IHttpRequest request, IHttpResponse response)
         {
             UUID assetID;
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/Resources/AssetInventoryServerPlugins.addin.xml b/OpenSim/Grid/AssetInventoryServer/Plugins/Resources/AssetInventoryServerPlugins.addin.xml
index 089c6a2..0ec28de 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/Resources/AssetInventoryServerPlugins.addin.xml
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/Resources/AssetInventoryServerPlugins.addin.xml
@@ -10,4 +10,10 @@
     <Extension path="/OpenSim/AssetInventoryServer/MetricsProvider">
         <Plugin id="AssetInventoryMetrics" provider="OpenSim.Grid.AssetInventoryServer.Plugins.dll" type="OpenSim.Grid.AssetInventoryServer.Plugins.NullMetricsPlugin" />
     </Extension>
+    <Extension path="/OpenSim/AssetInventoryServer/Frontend">
+        <Plugin id="BrowseFrontend" provider="OpenSim.Grid.AssetInventoryServer.Plugins.dll" type="OpenSim.Grid.AssetInventoryServer.Plugins.BrowseFrontendPlugin" />
+    </Extension>
+    <Extension path="/OpenSim/AssetInventoryServer/Frontend">
+        <Plugin id="ReferenceFrontend" provider="OpenSim.Grid.AssetInventoryServer.Plugins.dll" type="OpenSim.Grid.AssetInventoryServer.Plugins.ReferenceFrontendPlugin" />
+    </Extension>
 </Addin>
diff --git a/prebuild.xml b/prebuild.xml
index cfa2b92..83e31f2 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -797,8 +797,13 @@
 
       <ReferencePath>../../../../bin/</ReferencePath>
       <Reference name="System" />
+      <Reference name="System.Web"/>
       <Reference name="OpenSim.Grid.AssetInventoryServer" />
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenMetaverse"/>
       <Reference name="OpenMetaverseTypes"/>
+      <Reference name="OpenMetaverse.StructuredData2"/>
+      <Reference name="HttpServer2"/>
 
       <Files>
         <Match pattern="*.cs" recurse="false" />