From 5cf6a6f8302b4f03d45c21f0731978da1d3ddcab Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 30 Dec 2014 07:58:42 -0800
Subject: WARNING: BREAKING CHANGES FOR REGION MODULE DEVELOPMENT. This cleans
 up Opensim's use of mono addins. In particular, the extension points
 /OpenSim/RegionModules and /OpenSim/WindModule moved from OpenSim.exe to
 OpenSim.Region.Framework.dll. From here on, developers of region modules
 should declare their dlls to be dependent on OpenSim.Region.Framework,
 starting with version 0.8.1 Additional changes: - Addins version uniformly
 updated to 0.8.1. These numbers should be compatible with the release numbers
 or else it becomes very confusing. - Mono addins directives moved from files
 addins.xml to embedded directives in the class and assembly declarations, to
 make it all consistent

---
 OpenSim/Region/Application/IApplicationPlugin.cs                      | 2 ++
 OpenSim/Region/Application/Properties/AssemblyInfo.cs                 | 4 ++++
 .../Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs   | 2 +-
 OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs                 | 2 +-
 OpenSim/Region/DataSnapshot/DataSnapshotManager.cs                    | 2 +-
 OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs              | 1 +
 OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs               | 3 +++
 OpenSim/Region/Framework/Properties/AssemblyInfo.cs                   | 3 +++
 OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs             | 2 +-
 OpenSim/Region/UserStatistics/WebStatsModule.cs                       | 2 +-
 10 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index 6e6d48c..a3fa66c 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -26,12 +26,14 @@
  */
 
 using OpenSim.Framework;
+using Mono.Addins;
 
 namespace OpenSim
 {
     /// <summary>
     /// OpenSimulator Application Plugin framework interface
     /// </summary>
+    [TypeExtensionPoint(NodeName="Plugin", NodeType = typeof(PluginExtensionNode), Path="/OpenSim/Startup")]
     public interface IApplicationPlugin : IPlugin
     {
         /// <summary>
diff --git a/OpenSim/Region/Application/Properties/AssemblyInfo.cs b/OpenSim/Region/Application/Properties/AssemblyInfo.cs
index 45d89c8..3e61575 100644
--- a/OpenSim/Region/Application/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Application/Properties/AssemblyInfo.cs
@@ -1,6 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Mono.Addins;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -30,3 +31,6 @@ using System.Runtime.InteropServices;
 //      Revision
 //
 [assembly: AssemblyVersion("0.8.1.*")]
+
+[assembly: AddinRoot("OpenSim", "0.8.1")]
+[assembly: ImportAddinAssembly("Opensim.Framework.dll")]
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
index 9a0a5d5..b05af22 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
@@ -41,7 +41,7 @@ using OpenSim.Region.Framework.Scenes;
 using Caps = OpenSim.Framework.Capabilities.Caps;
 
 [assembly: Addin("LindenCaps", "0.1")]
-[assembly: AddinDependency("OpenSim", "0.8.1")]
+[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
 namespace OpenSim.Region.ClientStack.Linden
 {
 
diff --git a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
index 8b832a1..8cafa12 100644
--- a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@ using Mono.Addins;
 
 
 [assembly: Addin("OpenSim.Region.CoreModules", "0.1")]
-[assembly: AddinDependency("OpenSim", "0.8.1")]
+[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
 
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 8bcb178..9d3ae5e 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -43,7 +43,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
 [assembly: Addin("DataSnapshot", "0.1")]
-[assembly: AddinDependency("OpenSim", "0.8.1")]
+[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
 
 namespace OpenSim.Region.DataSnapshot
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs b/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
index 9b1e4ca..2089bce 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
@@ -32,6 +32,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
+    [TypeExtensionPoint(Path = "/OpenSim/RegionModules", NodeName="RegionModule")]
     public interface IRegionModuleBase
     {
         /// <value>
diff --git a/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs b/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs
index b087c8b..16b6024 100644
--- a/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWindModelPlugin.cs
@@ -33,8 +33,11 @@ using OpenSim.Framework;
 using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
 
+using Mono.Addins;
+
 namespace OpenSim.Region.Framework.Interfaces
 {
+    [TypeExtensionPoint(Path = "/OpenSim/WindModule", NodeName = "WindModel")]
     public interface IWindModelPlugin : IPlugin
     {
         /// <summary>
diff --git a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs b/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
index 3692e28..6fe2892 100644
--- a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
@@ -1,6 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Mono.Addins;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -22,6 +23,7 @@ using System.Runtime.InteropServices;
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("d25e7aed-7f55-4bb8-9970-0d7d978ea8a5")]
 
+
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
@@ -30,4 +32,5 @@ using System.Runtime.InteropServices;
 //      Revision
 //
 [assembly: AssemblyVersion("0.8.1.*")]
+[assembly: AddinRoot("OpenSim.Region.Framework", "0.8.1")]
 
diff --git a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
index 2fd412c..3f53229 100644
--- a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
@@ -34,4 +34,4 @@ using Mono.Addins;
 
 
 [assembly: Addin("OpenSim.Region.OptionalModules", "0.1")]
-[assembly: AddinDependency("OpenSim", "0.8.1")]
+[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs
index 7e57e64..57a2502 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -51,7 +51,7 @@ using OSD = OpenMetaverse.StructuredData.OSD;
 using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 
 [assembly: Addin("WebStats", "1.0")]
-[assembly: AddinDependency("OpenSim", "0.8.1")]
+[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
 
 namespace OpenSim.Region.UserStatistics
 {
-- 
cgit v1.1