1 files changed, 36 insertions, 24 deletions

diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs b/OpenSim/Data/IXGroupData.cs
index a88fe88..2965e8c 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs
+++ b/OpenSim/Data/IXGroupData.cs
@@ -25,35 +25,47 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Framework.Servers.HttpServer;
+using System;
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenSim.Framework;
 
-namespace OpenSim.ApplicationPlugins.Rest.Inventory
+namespace OpenSim.Data
 {
+    public class XGroup
+    {
+        public UUID groupID;
+        public UUID ownerRoleID;
+        public string name;
+        public string charter;
+        public bool showInList; 
+        public UUID insigniaID; 
+        public int membershipFee;
+        public bool openEnrollment;
+        public bool allowPublish;
+        public bool maturePublish; 
+        public UUID founderID;
+        public ulong everyonePowers;
+        public ulong ownersPowers;
 
-    /// <remarks>
-    /// The handler delegates are not noteworthy. The allocator allows
-    /// a given handler to optionally subclass the base RequestData
-    /// structure to carry any locally required per-request state
-    /// needed.
-    /// </remarks>
-
-    public delegate void        RestMethodHandler(RequestData rdata);
-    public delegate RequestData RestMethodAllocator(OSHttpRequest request, OSHttpResponse response, string path);
+        public XGroup Clone()
+        {
+            return (XGroup)MemberwiseClone();
+        }
+    }
 
     /// <summary>
-    /// This interface exports the generic plugin-handling services
-    /// available to each loaded REST services module (IRest implementation)
+    /// Early stub interface for groups data, not final.
     /// </summary>
-
-    internal interface IRestHandler
+    /// <remarks>
+    /// Currently in-use only for regression test purposes.  Needs to be filled out over time.
+    /// </remarks>
+    public interface IXGroupData
     {
-
-        string MsgId     { get; }
-        string RequestId { get; }
-
-        void   AddPathHandler(RestMethodHandler mh, string path, RestMethodAllocator ma);
-        void AddStreamHandler(string httpMethod, string path, RestMethod method);
-
+        bool StoreGroup(XGroup group);
+        XGroup[] GetGroups(string field, string val);
+        XGroup[] GetGroups(string[] fields, string[] vals);
+        bool DeleteGroups(string field, string val);
+        bool DeleteGroups(string[] fields, string[] vals);
     }
-
-}
+}
\ No newline at end of file