diff options
author | Diva Canto | 2014-12-30 07:58:42 -0800 |
---|---|---|
committer | Diva Canto | 2014-12-30 07:58:42 -0800 |
commit | 5cf6a6f8302b4f03d45c21f0731978da1d3ddcab (patch) | |
tree | c185a144270d8c06b45779a79b0aceb478876515 /OpenSim/ApplicationPlugins | |
parent | Updated OpenSim-as-addin version from 0.5 to 0.8.1. The addin version number ... (diff) | |
download | opensim-SC_OLD-5cf6a6f8302b4f03d45c21f0731978da1d3ddcab.zip opensim-SC_OLD-5cf6a6f8302b4f03d45c21f0731978da1d3ddcab.tar.gz opensim-SC_OLD-5cf6a6f8302b4f03d45c21f0731978da1d3ddcab.tar.bz2 opensim-SC_OLD-5cf6a6f8302b4f03d45c21f0731978da1d3ddcab.tar.xz |
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
Diffstat (limited to '')
9 files changed, 17 insertions, 37 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index 3455411..74d9ae4 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
@@ -40,9 +40,11 @@ using OpenSim.Region.CoreModules.Scripting.DynamicTexture; | |||
40 | using OpenSim.Region.CoreModules.Scripting.LoadImageURL; | 40 | using OpenSim.Region.CoreModules.Scripting.LoadImageURL; |
41 | using OpenSim.Region.CoreModules.Scripting.XMLRPC; | 41 | using OpenSim.Region.CoreModules.Scripting.XMLRPC; |
42 | using OpenSim.Services.Interfaces; | 42 | using OpenSim.Services.Interfaces; |
43 | using Mono.Addins; | ||
43 | 44 | ||
44 | namespace OpenSim.ApplicationPlugins.LoadRegions | 45 | namespace OpenSim.ApplicationPlugins.LoadRegions |
45 | { | 46 | { |
47 | [Extension(Path="/OpenSim/Startup", Id="LoadRegions", NodeName="Plugin")] | ||
46 | public class LoadRegionsPlugin : IApplicationPlugin, IRegionCreator | 48 | public class LoadRegionsPlugin : IApplicationPlugin, IRegionCreator |
47 | { | 49 | { |
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs index 89d24ac..d289e78 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs | |||
@@ -27,16 +27,17 @@ | |||
27 | 27 | ||
28 | using System.Reflection; | 28 | using System.Reflection; |
29 | using System.Runtime.InteropServices; | 29 | using System.Runtime.InteropServices; |
30 | using Mono.Addins; | ||
30 | 31 | ||
31 | // General information about an assembly is controlled through the following | 32 | // General information about an assembly is controlled through the following |
32 | // set of attributes. Change these attribute values to modify the information | 33 | // set of attributes. Change these attribute values to modify the information |
33 | // associated with an assembly. | 34 | // associated with an assembly. |
34 | 35 | ||
35 | [assembly : AssemblyTitle("OpenSim.Addin")] | 36 | [assembly : AssemblyTitle("OpenSim.ApplicationPlugins.LoadRegions")] |
36 | [assembly : AssemblyDescription("")] | 37 | [assembly : AssemblyDescription("")] |
37 | [assembly : AssemblyConfiguration("")] | 38 | [assembly : AssemblyConfiguration("")] |
38 | [assembly : AssemblyCompany("http://opensimulator.org")] | 39 | [assembly : AssemblyCompany("http://opensimulator.org")] |
39 | [assembly : AssemblyProduct("OpenSim.Addin")] | 40 | [assembly : AssemblyProduct("OpenSim")] |
40 | [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2009")] | 41 | [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2009")] |
41 | [assembly : AssemblyTrademark("")] | 42 | [assembly : AssemblyTrademark("")] |
42 | [assembly : AssemblyCulture("")] | 43 | [assembly : AssemblyCulture("")] |
@@ -63,3 +64,6 @@ using System.Runtime.InteropServices; | |||
63 | // [assembly: AssemblyVersion("0.7.6.*")] | 64 | // [assembly: AssemblyVersion("0.7.6.*")] |
64 | 65 | ||
65 | [assembly : AssemblyVersion("0.8.1.*")] | 66 | [assembly : AssemblyVersion("0.8.1.*")] |
67 | |||
68 | [assembly: Addin("OpenSim.ApplicationPlugins.LoadRegions", "0.1")] | ||
69 | [assembly: AddinDependency("OpenSim", "0.8.1")] | ||
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/Resources/LoadRegionsPlugin.addin.xml b/OpenSim/ApplicationPlugins/LoadRegions/Resources/LoadRegionsPlugin.addin.xml deleted file mode 100644 index 840a1b4..0000000 --- a/OpenSim/ApplicationPlugins/LoadRegions/Resources/LoadRegionsPlugin.addin.xml +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | <Addin id="OpenSim.ApplicationPlugins.LoadRegions" version="0.1"> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.ApplicationPlugins.LoadRegions.dll"/> | ||
4 | </Runtime> | ||
5 | <Dependencies> | ||
6 | <Addin id="OpenSim" version="0.8.1" /> | ||
7 | </Dependencies> | ||
8 | <Extension path = "/OpenSim/Startup"> | ||
9 | <Plugin id="LoadRegions" type="OpenSim.ApplicationPlugins.LoadRegions.LoadRegionsPlugin" /> | ||
10 | </Extension> | ||
11 | </Addin> | ||
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs index 0ada5af..edef4d5 100644 --- a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs | |||
@@ -1,6 +1,7 @@ | |||
1 | using System.Reflection; | 1 | using System.Reflection; |
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | using Mono.Addins; | ||
4 | 5 | ||
5 | // General Information about an assembly is controlled through the following | 6 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 7 | // set of attributes. Change these attribute values to modify the information |
@@ -31,3 +32,5 @@ using System.Runtime.InteropServices; | |||
31 | // | 32 | // |
32 | [assembly: AssemblyVersion("0.8.1.*")] | 33 | [assembly: AssemblyVersion("0.8.1.*")] |
33 | 34 | ||
35 | [assembly: Addin("OpenSim.ApplicationPlugins.RegionModulesController", "0.1")] | ||
36 | [assembly: AddinDependency("OpenSim", "0.8.1")] | ||
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs index e03483a..86f71d9 100644 --- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs +++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs | |||
@@ -38,6 +38,7 @@ using OpenSim.Region.Framework.Scenes; | |||
38 | 38 | ||
39 | namespace OpenSim.ApplicationPlugins.RegionModulesController | 39 | namespace OpenSim.ApplicationPlugins.RegionModulesController |
40 | { | 40 | { |
41 | [Extension(Path = "/OpenSim/Startup", Id = "LoadRegions", NodeName = "Plugin")] | ||
41 | public class RegionModulesControllerPlugin : IRegionModulesController, | 42 | public class RegionModulesControllerPlugin : IRegionModulesController, |
42 | IApplicationPlugin | 43 | IApplicationPlugin |
43 | { | 44 | { |
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/Resources/RegionModulesControllerPlugin.addin.xml b/OpenSim/ApplicationPlugins/RegionModulesController/Resources/RegionModulesControllerPlugin.addin.xml deleted file mode 100644 index c537922..0000000 --- a/OpenSim/ApplicationPlugins/RegionModulesController/Resources/RegionModulesControllerPlugin.addin.xml +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | <Addin id="OpenSim.ApplicationPlugins.RegionModulesController" version="0.1"> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.ApplicationPlugins.RegionModulesController.dll"/> | ||
4 | </Runtime> | ||
5 | |||
6 | <Dependencies> | ||
7 | <Addin id="OpenSim" version="0.8.1" /> | ||
8 | </Dependencies> | ||
9 | |||
10 | <Extension path = "/OpenSim/Startup"> | ||
11 | <Plugin id="RegionModulesController" type="OpenSim.ApplicationPlugins.RegionModulesController.RegionModulesControllerPlugin" /> | ||
12 | </Extension> | ||
13 | </Addin> | ||
diff --git a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs index 245288f..7e9f6eb 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs | |||
@@ -1,6 +1,7 @@ | |||
1 | using System.Reflection; | 1 | using System.Reflection; |
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | using Mono.Addins; | ||
4 | 5 | ||
5 | // General Information about an assembly is controlled through the following | 6 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 7 | // set of attributes. Change these attribute values to modify the information |
@@ -31,3 +32,5 @@ using System.Runtime.InteropServices; | |||
31 | // | 32 | // |
32 | [assembly: AssemblyVersion("0.8.1.*")] | 33 | [assembly: AssemblyVersion("0.8.1.*")] |
33 | 34 | ||
35 | [assembly: Addin("OpenSim.ApplicationPlugins.RemoteController", "0.1")] | ||
36 | [assembly: AddinDependency("OpenSim", "0.8.1")] | ||
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 1e6e68b..3096323 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -39,6 +39,7 @@ using log4net; | |||
39 | using Nini.Config; | 39 | using Nini.Config; |
40 | using Nwc.XmlRpc; | 40 | using Nwc.XmlRpc; |
41 | using OpenMetaverse; | 41 | using OpenMetaverse; |
42 | using Mono.Addins; | ||
42 | using OpenSim; | 43 | using OpenSim; |
43 | using OpenSim.Framework; | 44 | using OpenSim.Framework; |
44 | using OpenSim.Framework.Communications; | 45 | using OpenSim.Framework.Communications; |
@@ -56,6 +57,7 @@ using RegionInfo = OpenSim.Framework.RegionInfo; | |||
56 | 57 | ||
57 | namespace OpenSim.ApplicationPlugins.RemoteController | 58 | namespace OpenSim.ApplicationPlugins.RemoteController |
58 | { | 59 | { |
60 | [Extension(Path = "/OpenSim/Startup", Id = "LoadRegions", NodeName = "Plugin")] | ||
59 | public class RemoteAdminPlugin : IApplicationPlugin | 61 | public class RemoteAdminPlugin : IApplicationPlugin |
60 | { | 62 | { |
61 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 63 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/ApplicationPlugins/RemoteController/Resources/RemoteAdminPlugin.addin.xml b/OpenSim/ApplicationPlugins/RemoteController/Resources/RemoteAdminPlugin.addin.xml deleted file mode 100644 index b0859f3..0000000 --- a/OpenSim/ApplicationPlugins/RemoteController/Resources/RemoteAdminPlugin.addin.xml +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | <Addin id="OpenSim.ApplicationPlugins.RemoteController" version="0.1"> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.ApplicationPlugins.RemoteController.dll"/> | ||
4 | </Runtime> | ||
5 | <Dependencies> | ||
6 | <Addin id="OpenSim" version="0.8.1" /> | ||
7 | </Dependencies> | ||
8 | <Extension path = "/OpenSim/Startup"> | ||
9 | <Plugin id="RemoteController" type="OpenSim.ApplicationPlugins.RemoteController.RemoteAdminPlugin" /> | ||
10 | </Extension> | ||
11 | </Addin> | ||