Offline IM: moved the Data and MySQL bits to the corresponding places in core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that.

3 files changed, 0 insertions, 141 deletions

diff --git a/OpenSim/Addons/OfflineIM/Data/IOfflineIMData.cs b/OpenSim/Addons/OfflineIM/Data/IOfflineIMData.cs
deleted file mode 100644
index a507f7d..0000000
--- a/OpenSim/Addons/OfflineIM/Data/IOfflineIMData.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System.Collections.Generic;
-using OpenSim.Data;
-using OpenMetaverse;
-
-namespace OpenSim.OfflineIM
-{
-    public class OfflineIMData
-    {
-        public UUID PrincipalID;
-        public Dictionary<string, string> Data;
-    }
-
-
-    public interface IOfflineIMData 
-    {
-        OfflineIMData[] Get(string field, string val);
-        long GetCount(string field, string key);
-        bool Store(OfflineIMData data);
-        bool Delete(string field, string val);
-        void DeleteOld();
-    }
-}
diff --git a/OpenSim/Addons/OfflineIM/Data/MySQLOfflineIMData.cs b/OpenSim/Addons/OfflineIM/Data/MySQLOfflineIMData.cs
deleted file mode 100644
index 0a61cd2..0000000
--- a/OpenSim/Addons/OfflineIM/Data/MySQLOfflineIMData.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-
-using OpenSim.Framework;
-using OpenSim.Data.MySQL;
-
-using OpenMetaverse;
-using MySql.Data.MySqlClient;
-
-namespace OpenSim.OfflineIM
-{
-    public class MySQLOfflineIMData : MySQLGenericTableHandler<OfflineIMData>, IOfflineIMData
-    {
-        protected override Assembly Assembly
-        {
-            // WARNING! Moving migrations to this assembly!!!
-            get { return GetType().Assembly; }
-        }
-
-        public MySQLOfflineIMData(string connectionString, string realm)
-            : base(connectionString, realm, "IM_Store")
-        {
-        }
-
-        public void DeleteOld()
-        {
-            uint now = (uint)Util.UnixTimeSinceEpoch();
-
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                cmd.CommandText = String.Format("delete from {0} where TMStamp < ?tstamp", m_Realm);
-                cmd.Parameters.AddWithValue("?tstamp", now - 14 * 24 * 60 * 60); // > 2 weeks old
-
-                ExecuteNonQuery(cmd);
-            }
-
-        }
-    }
-}
diff --git a/OpenSim/Addons/OfflineIM/Resources/IM_Store.migrations b/OpenSim/Addons/OfflineIM/Resources/IM_Store.migrations
deleted file mode 100644
index 7cfcd43..0000000
--- a/OpenSim/Addons/OfflineIM/Resources/IM_Store.migrations
+++ /dev/null
@@ -1,24 +0,0 @@
-:VERSION 1         # -------------------------- 
-
-BEGIN;
-
-CREATE TABLE `im_offline` (
-  `ID` MEDIUMINT NOT NULL AUTO_INCREMENT,
-  `PrincipalID` char(36) NOT NULL default '',
-  `Message` text NOT NULL,
-  `TMStamp` timestamp NOT NULL,
-  PRIMARY KEY  (`ID`),
-  KEY `PrincipalID` (`PrincipalID`)
-) ENGINE=MyISAM;
-
-COMMIT;
-
-:VERSION 2         # -------------------------- 
-
-BEGIN;
-
-INSERT INTO `im_offline` SELECT * from `diva_im_offline`;
-DROP TABLE `diva_im_offline`;
-DELETE FROM `migrations` WHERE name='diva_im_Store';
-
-COMMIT;
\ No newline at end of file