diff options
author | Mike Mazur | 2009-02-16 02:27:01 +0000 |
---|---|---|
committer | Mike Mazur | 2009-02-16 02:27:01 +0000 |
commit | f1e71ca5e115366e55fb1b721d85cef08e3e5816 (patch) | |
tree | 7f8bcad91db1de772a6580abe255fb39e706e2e0 /OpenSim/Grid/AssetInventoryServer/Plugins | |
parent | Move NullAuthentication and AuthorizeAll extensions to plugins. (diff) | |
download | opensim-SC_OLD-f1e71ca5e115366e55fb1b721d85cef08e3e5816.zip opensim-SC_OLD-f1e71ca5e115366e55fb1b721d85cef08e3e5816.tar.gz opensim-SC_OLD-f1e71ca5e115366e55fb1b721d85cef08e3e5816.tar.bz2 opensim-SC_OLD-f1e71ca5e115366e55fb1b721d85cef08e3e5816.tar.xz |
- add list for backend plugins and Dispose() all plugins on shutdown
- fix some plugin names
- remove most references to ExtensionLoader
- remove commented out AssetInventoryServer blobs from prebuild.xml
Diffstat (limited to 'OpenSim/Grid/AssetInventoryServer/Plugins')
8 files changed, 3 insertions, 14 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs index 8974b6f..1c0fca7 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs | |||
@@ -71,7 +71,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins | |||
71 | 71 | ||
72 | public string Name | 72 | public string Name |
73 | { | 73 | { |
74 | get { return "AssetInventoryServer Null authentication frontend"; } | 74 | get { return "AssetInventoryServer Authorize All"; } |
75 | } | 75 | } |
76 | 76 | ||
77 | #endregion IPlugin implementation | 77 | #endregion IPlugin implementation |
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs index 81e58c6..ccb21b0 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs | |||
@@ -71,7 +71,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins | |||
71 | 71 | ||
72 | public string Name | 72 | public string Name |
73 | { | 73 | { |
74 | get { return "AssetInventoryServer Null authentication frontend"; } | 74 | get { return "AssetInventoryServer Null authentication"; } |
75 | } | 75 | } |
76 | 76 | ||
77 | #endregion IPlugin implementation | 77 | #endregion IPlugin implementation |
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs index ebab557..f831e24 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs | |||
@@ -34,7 +34,6 @@ using System.IO; | |||
34 | using System.Text; | 34 | using System.Text; |
35 | using System.Xml; | 35 | using System.Xml; |
36 | using System.Xml.Serialization; | 36 | using System.Xml.Serialization; |
37 | using ExtensionLoader; | ||
38 | using OpenMetaverse; | 37 | using OpenMetaverse; |
39 | using HttpServer; | 38 | using HttpServer; |
40 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
@@ -147,8 +146,6 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim | |||
147 | { | 146 | { |
148 | Metadata metadata = new Metadata(); | 147 | Metadata metadata = new Metadata(); |
149 | 148 | ||
150 | Logger.Log.Debug("Handling OpenSim asset upload"); | ||
151 | |||
152 | try | 149 | try |
153 | { | 150 | { |
154 | AssetBase asset = (AssetBase) new XmlSerializer(typeof (AssetBase)).Deserialize(request.Body); | 151 | AssetBase asset = (AssetBase) new XmlSerializer(typeof (AssetBase)).Deserialize(request.Body); |
@@ -185,7 +182,6 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim | |||
185 | response.Status = HttpStatusCode.BadRequest; | 182 | response.Status = HttpStatusCode.BadRequest; |
186 | } | 183 | } |
187 | 184 | ||
188 | Logger.Log.Debug("Finished handling OpenSim asset upload, Status: " + response.Status.ToString()); | ||
189 | return true; | 185 | return true; |
190 | } | 186 | } |
191 | } | 187 | } |
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs index 6c02cde..eb000ae 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs | |||
@@ -32,8 +32,6 @@ using System.Collections.Generic; | |||
32 | using System.Net; | 32 | using System.Net; |
33 | using System.Data; | 33 | using System.Data; |
34 | using MySql.Data.MySqlClient; | 34 | using MySql.Data.MySqlClient; |
35 | using ExtensionLoader; | ||
36 | using ExtensionLoader.Config; | ||
37 | using OpenMetaverse; | 35 | using OpenMetaverse; |
38 | using OpenMetaverse.StructuredData; | 36 | using OpenMetaverse.StructuredData; |
39 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs index 6e33cdf..0f3867a 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs | |||
@@ -32,7 +32,6 @@ using System.Collections.Generic; | |||
32 | using System.Net; | 32 | using System.Net; |
33 | using System.IO; | 33 | using System.IO; |
34 | using System.Xml; | 34 | using System.Xml; |
35 | using ExtensionLoader; | ||
36 | using OpenMetaverse; | 35 | using OpenMetaverse; |
37 | using OpenMetaverse.StructuredData; | 36 | using OpenMetaverse.StructuredData; |
38 | using HttpServer; | 37 | using HttpServer; |
@@ -92,7 +91,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim | |||
92 | 91 | ||
93 | public string Name | 92 | public string Name |
94 | { | 93 | { |
95 | get { return "AssetInventoryServer OpenSim asset frontend"; } | 94 | get { return "AssetInventoryServer OpenSim inventory frontend"; } |
96 | } | 95 | } |
97 | 96 | ||
98 | #endregion IPlugin implementation | 97 | #endregion IPlugin implementation |
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs index 3fd06c0..a41c48d 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs | |||
@@ -32,8 +32,6 @@ using System.Collections.Generic; | |||
32 | using System.Net; | 32 | using System.Net; |
33 | using System.Data; | 33 | using System.Data; |
34 | using MySql.Data.MySqlClient; | 34 | using MySql.Data.MySqlClient; |
35 | using ExtensionLoader; | ||
36 | using ExtensionLoader.Config; | ||
37 | using OpenMetaverse; | 35 | using OpenMetaverse; |
38 | using OpenMetaverse.StructuredData; | 36 | using OpenMetaverse.StructuredData; |
39 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs index fd198d9..301a55f 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs | |||
@@ -31,7 +31,6 @@ using System; | |||
31 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
32 | using System.Net; | 32 | using System.Net; |
33 | using System.IO; | 33 | using System.IO; |
34 | using ExtensionLoader; | ||
35 | using OpenMetaverse; | 34 | using OpenMetaverse; |
36 | using OpenMetaverse.StructuredData; | 35 | using OpenMetaverse.StructuredData; |
37 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs index 78dae35..415874a 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs | |||
@@ -32,7 +32,6 @@ using System.Collections.Generic; | |||
32 | using System.Net; | 32 | using System.Net; |
33 | using System.IO; | 33 | using System.IO; |
34 | using System.Text; | 34 | using System.Text; |
35 | using ExtensionLoader; | ||
36 | using OpenMetaverse; | 35 | using OpenMetaverse; |
37 | using OpenMetaverse.StructuredData; | 36 | using OpenMetaverse.StructuredData; |
38 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |