From 134f86e8d5c414409631b25b8c6f0ee45fbd8631 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 3 Nov 2016 21:44:39 +1000
Subject: Initial update to OpenSim 0.8.2.1 source code.
---
.../Framework/Communications/GenericAsyncResult.cs | 185 ---------
OpenSim/Framework/Communications/IUserService.cs | 157 --------
.../Communications/Limit/IRequestLimitStrategy.cs | 66 ----
.../Communications/Limit/NullLimitStrategy.cs | 40 --
.../Communications/Limit/RepeatLimitStrategy.cs | 109 -----
.../Communications/Limit/TimeLimitStrategy.cs | 140 -------
.../Communications/Properties/AssemblyInfo.cs | 65 ---
OpenSim/Framework/Communications/RestClient.cs | 438 ---------------------
OpenSim/Framework/Communications/XMPP/XmppError.cs | 39 --
.../Framework/Communications/XMPP/XmppIqStanza.cs | 60 ---
.../Communications/XMPP/XmppMessageStanza.cs | 93 -----
.../Communications/XMPP/XmppPresenceStanza.cs | 69 ----
.../Communications/XMPP/XmppSerializer.cs | 79 ----
.../Framework/Communications/XMPP/XmppStanza.cs | 70 ----
.../Framework/Communications/XMPP/XmppWriter.cs | 57 ---
15 files changed, 1667 deletions(-)
delete mode 100644 OpenSim/Framework/Communications/GenericAsyncResult.cs
delete mode 100644 OpenSim/Framework/Communications/IUserService.cs
delete mode 100644 OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs
delete mode 100644 OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs
delete mode 100644 OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs
delete mode 100644 OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs
delete mode 100644 OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
delete mode 100644 OpenSim/Framework/Communications/RestClient.cs
delete mode 100644 OpenSim/Framework/Communications/XMPP/XmppError.cs
delete mode 100644 OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs
delete mode 100644 OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
delete mode 100644 OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs
delete mode 100644 OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
delete mode 100644 OpenSim/Framework/Communications/XMPP/XmppStanza.cs
delete mode 100644 OpenSim/Framework/Communications/XMPP/XmppWriter.cs
(limited to 'OpenSim/Framework/Communications')
diff --git a/OpenSim/Framework/Communications/GenericAsyncResult.cs b/OpenSim/Framework/Communications/GenericAsyncResult.cs
deleted file mode 100644
index 8e3f62b..0000000
--- a/OpenSim/Framework/Communications/GenericAsyncResult.cs
+++ /dev/null
@@ -1,185 +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.Threading;
-
-namespace OpenSim.Framework.Communications
-{
- internal class SimpleAsyncResult : IAsyncResult
- {
- private readonly AsyncCallback m_callback;
-
- ///
- /// Is process completed?
- ///
- /// Should really be boolean, but VolatileRead has no boolean method
- private byte m_completed;
-
- ///
- /// Did process complete synchronously?
- ///
- /// I have a hard time imagining a scenario where this is the case, again, same issue about
- /// booleans and VolatileRead as m_completed
- ///
- private byte m_completedSynchronously;
-
- private readonly object m_asyncState;
- private ManualResetEvent m_waitHandle;
- private Exception m_exception;
-
- internal SimpleAsyncResult(AsyncCallback cb, object state)
- {
- m_callback = cb;
- m_asyncState = state;
- m_completed = 0;
- m_completedSynchronously = 1;
- }
-
- #region IAsyncResult Members
-
- public object AsyncState
- {
- get { return m_asyncState; }
- }
-
- public WaitHandle AsyncWaitHandle
- {
- get
- {
- if (m_waitHandle == null)
- {
- bool done = IsCompleted;
- ManualResetEvent mre = new ManualResetEvent(done);
- if (Interlocked.CompareExchange(ref m_waitHandle, mre, null) != null)
- {
- mre.Close();
- }
- else
- {
- if (!done && IsCompleted)
- {
- m_waitHandle.Set();
- }
- }
- }
-
- return m_waitHandle;
- }
- }
-
-
- public bool CompletedSynchronously
- {
- get { return Thread.VolatileRead(ref m_completedSynchronously) == 1; }
- }
-
-
- public bool IsCompleted
- {
- get { return Thread.VolatileRead(ref m_completed) == 1; }
- }
-
- #endregion
-
- #region class Methods
-
- internal void SetAsCompleted(bool completedSynchronously)
- {
- m_completed = 1;
- if (completedSynchronously)
- m_completedSynchronously = 1;
- else
- m_completedSynchronously = 0;
-
- SignalCompletion();
- }
-
- internal void HandleException(Exception e, bool completedSynchronously)
- {
- m_completed = 1;
- if (completedSynchronously)
- m_completedSynchronously = 1;
- else
- m_completedSynchronously = 0;
- m_exception = e;
-
- SignalCompletion();
- }
-
- private void SignalCompletion()
- {
- if (m_waitHandle != null) m_waitHandle.Set();
-
- if (m_callback != null) m_callback(this);
- }
-
- public void EndInvoke()
- {
- // This method assumes that only 1 thread calls EndInvoke
- if (!IsCompleted)
- {
- // If the operation isn't done, wait for it
- AsyncWaitHandle.WaitOne();
- AsyncWaitHandle.Close();
- m_waitHandle.Close();
- m_waitHandle = null; // Allow early GC
- }
-
- // Operation is done: if an exception occured, throw it
- if (m_exception != null) throw m_exception;
- }
-
- #endregion
- }
-
- internal class AsyncResult : SimpleAsyncResult
- {
- private T m_result = default(T);
-
- public AsyncResult(AsyncCallback asyncCallback, Object state) :
- base(asyncCallback, state)
- {
- }
-
- public void SetAsCompleted(T result, bool completedSynchronously)
- {
- // Save the asynchronous operation's result
- m_result = result;
-
- // Tell the base class that the operation completed
- // sucessfully (no exception)
- base.SetAsCompleted(completedSynchronously);
- }
-
- public new T EndInvoke()
- {
- base.EndInvoke();
- return m_result;
- }
- }
-}
\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
deleted file mode 100644
index dfa059d..0000000
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ /dev/null
@@ -1,157 +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.Generic;
-using OpenMetaverse;
-using OpenSim.Services.Interfaces;
-
-namespace OpenSim.Framework.Communications
-{
- public interface IUserService
- {
- ///
- /// Add a temporary user profile.
- ///
- /// A temporary user profile is one that should exist only for the lifetime of the process.
- ///
- void AddTemporaryUserProfile(UserProfileData userProfile);
-
- ///
- /// Loads a user profile by name
- ///
- /// First name
- /// Last name
- /// A user profile. Returns null if no profile is found
- UserProfileData GetUserProfile(string firstName, string lastName);
-
- ///
- /// Loads a user profile from a database by UUID
- ///
- /// The target UUID
- /// A user profile. Returns null if no user profile is found.
- UserProfileData GetUserProfile(UUID userId);
-
- UserProfileData GetUserProfile(Uri uri);
-
- Uri GetUserUri(UserProfileData userProfile);
-
- UserAgentData GetAgentByUUID(UUID userId);
-
- void ClearUserAgent(UUID avatarID);
- List GenerateAgentPickerRequestResponse(UUID QueryID, string Query);
-
- UserProfileData SetupMasterUser(string firstName, string lastName);
- UserProfileData SetupMasterUser(string firstName, string lastName, string password);
- UserProfileData SetupMasterUser(UUID userId);
-
- ///
- /// Update the user's profile.
- ///
- /// UserProfileData object with updated data. Should be obtained
- /// via a call to GetUserProfile().
- /// true if the update could be applied, false if it could not be applied.
- bool UpdateUserProfile(UserProfileData data);
-
- ///
- /// Adds a new friend to the database for XUser
- ///
- /// The agent that who's friends list is being added to
- /// The agent that being added to the friends list of the friends list owner
- /// A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects
- void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms);
-
- ///
- /// Delete friend on friendlistowner's friendlist.
- ///
- /// The agent that who's friends list is being updated
- /// The Ex-friend agent
- void RemoveUserFriend(UUID friendlistowner, UUID friend);
-
- ///
- /// Update permissions for friend on friendlistowner's friendlist.
- ///
- /// The agent that who's friends list is being updated
- /// The agent that is getting or loosing permissions
- /// A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects
- void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms);
-
- ///
- /// Logs off a user on the user server
- ///
- /// UUID of the user
- /// UUID of the Region
- /// regionhandle
- /// final position
- /// final lookat
- void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat);
-
- ///
- /// Logs off a user on the user server (deprecated as of 2008-08-27)
- ///
- /// UUID of the user
- /// UUID of the Region
- /// regionhandle
- /// final position x
- /// final position y
- /// final position z
- void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz);
-
- ///
- /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship
- /// for UUID friendslistowner
- ///
- ///
- /// The agent for whom we're retreiving the friends Data.
- ///
- /// A List of FriendListItems that contains info about the user's friends.
- /// Always returns a list even if the user has no friends
- ///
- List GetUserFriendList(UUID friendlistowner);
-
- // This probably shouldn't be here, it belongs to IAuthentication
- // But since Scenes only have IUserService references, I'm placing it here for now.
- bool VerifySession(UUID userID, UUID sessionID);
-
- ///
- /// Authenticate a user by their password.
- ///
- ///
- /// This is used by callers outside the login process that want to
- /// verify a user who has given their password.
- ///
- /// This should probably also be in IAuthentication but is here for the same reasons as VerifySession() is
- ///
- ///
- ///
- ///
- bool AuthenticateUserByPassword(UUID userID, string password);
-
- // Temporary Hack until we move everything to the new service model
- void SetInventoryService(IInventoryService invService);
- }
-}
diff --git a/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs
deleted file mode 100644
index 070d106..0000000
--- a/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs
+++ /dev/null
@@ -1,66 +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.
- */
-
-namespace OpenSim.Framework.Communications.Limit
-{
- ///
- /// Interface for strategies that can limit requests from the client. Currently only used in the
- /// texture modules to deal with repeated requests for certain textures. However, limiting strategies
- /// could be used with other requests.
- ///
- public interface IRequestLimitStrategy
- {
- ///
- /// Should the request be allowed? If the id is not monitored, then the request is always allowed.
- /// Otherwise, the strategy criteria will be applied.
- ///
- ///
- ///
- bool AllowRequest(TId id);
-
- ///
- /// Has the request been refused just once?
- ///
- /// False if the request has not yet been refused, or if the request has been refused more
- /// than once.
- bool IsFirstRefusal(TId id);
-
- ///
- /// Start monitoring for future AllowRequest calls. If the id is already monitored, then monitoring
- /// continues.
- ///
- ///
- void MonitorRequests(TId id);
-
- ///
- /// Is the id being monitored?
- ///
- ///
- ///
- bool IsMonitoringRequests(TId id);
- }
-}
diff --git a/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs
deleted file mode 100644
index 7672653..0000000
--- a/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs
+++ /dev/null
@@ -1,40 +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.
- */
-
-namespace OpenSim.Framework.Communications.Limit
-{
- ///
- /// Strategy which polices no limits
- ///
- public class NullLimitStrategy : IRequestLimitStrategy
- {
- public bool AllowRequest(TId id) { return true; }
- public bool IsFirstRefusal(TId id) { return false; }
- public void MonitorRequests(TId id) { /* intentionally blank */ }
- public bool IsMonitoringRequests(TId id) { return false; }
- }
-}
diff --git a/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs
deleted file mode 100644
index 44dd592..0000000
--- a/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs
+++ /dev/null
@@ -1,109 +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;
-
-namespace OpenSim.Framework.Communications.Limit
-{
- ///
- /// Limit requests by discarding them after they've been repeated a certain number of times.
- ///
- public class RepeatLimitStrategy : IRequestLimitStrategy
- {
- ///
- /// Record each asset request that we're notified about.
- ///
- private readonly Dictionary requestCounts = new Dictionary();
-
- ///
- /// The maximum number of requests that can be made before we drop subsequent requests.
- ///
- private readonly int m_maxRequests;
- public int MaxRequests
- {
- get { return m_maxRequests; }
- }
-
- ///
- /// The maximum number of requests that may be served before all further
- /// requests are dropped.
- public RepeatLimitStrategy(int maxRequests)
- {
- m_maxRequests = maxRequests;
- }
-
- ///
- ///
- ///
- public bool AllowRequest(TId id)
- {
- if (requestCounts.ContainsKey(id))
- {
- requestCounts[id] += 1;
-
- if (requestCounts[id] > m_maxRequests)
- {
- return false;
- }
- }
-
- return true;
- }
-
- ///
- ///
- ///
- public bool IsFirstRefusal(TId id)
- {
- if (requestCounts.ContainsKey(id) && m_maxRequests + 1 == requestCounts[id])
- {
- return true;
- }
-
- return false;
- }
-
- ///
- ///
- ///
- public void MonitorRequests(TId id)
- {
- if (!IsMonitoringRequests(id))
- {
- requestCounts.Add(id, 1);
- }
- }
-
- ///
- ///
- ///
- public bool IsMonitoringRequests(TId id)
- {
- return requestCounts.ContainsKey(id);
- }
- }
-}
diff --git a/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs
deleted file mode 100644
index 7ac8293..0000000
--- a/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs
+++ /dev/null
@@ -1,140 +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.Generic;
-
-namespace OpenSim.Framework.Communications.Limit
-{
- ///
- /// Limit requests by discarding repeat attempts that occur within a given time period
- ///
- /// XXX Don't use this for limiting texture downloading, at least not until we better handle multiple requests
- /// for the same texture at different resolutions.
- ///
- public class TimeLimitStrategy : IRequestLimitStrategy
- {
- ///
- /// Record the time at which an asset request occurs.
- ///
- private readonly Dictionary requests = new Dictionary();
-
- ///
- /// The minimum time period between which requests for the same data will be serviced.
- ///
- private readonly TimeSpan m_repeatPeriod;
- public TimeSpan RepeatPeriod
- {
- get { return m_repeatPeriod; }
- }
-
- ///
- ///
- public TimeLimitStrategy(TimeSpan repeatPeriod)
- {
- m_repeatPeriod = repeatPeriod;
- }
-
- ///
- ///
- ///
- public bool AllowRequest(TId id)
- {
- if (IsMonitoringRequests(id))
- {
- DateTime now = DateTime.Now;
- TimeSpan elapsed = now - requests[id].Time;
-
- if (elapsed < RepeatPeriod)
- {
- requests[id].Refusals += 1;
- return false;
- }
-
- requests[id].Time = now;
- }
-
- return true;
- }
-
- ///
- ///
- ///
- public bool IsFirstRefusal(TId id)
- {
- if (IsMonitoringRequests(id))
- {
- if (1 == requests[id].Refusals)
- {
- return true;
- }
- }
-
- return false;
- }
-
- ///
- ///
- ///
- public void MonitorRequests(TId id)
- {
- if (!IsMonitoringRequests(id))
- {
- requests.Add(id, new Request(DateTime.Now));
- }
- }
-
- ///
- ///
- ///
- public bool IsMonitoringRequests(TId id)
- {
- return requests.ContainsKey(id);
- }
- }
-
- ///
- /// Private request details.
- ///
- class Request
- {
- ///
- /// Time of last request
- ///
- public DateTime Time;
-
- ///
- /// Number of refusals associated with this request
- ///
- public int Refusals;
-
- public Request(DateTime time)
- {
- Time = time;
- }
- }
-}
diff --git a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
deleted file mode 100644
index 6d1c03a..0000000
--- a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,65 +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.Reflection;
-using System.Runtime.InteropServices;
-
-// General information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-
-[assembly : AssemblyTitle("OpenSim.Framework.Communications")]
-[assembly : AssemblyDescription("")]
-[assembly : AssemblyConfiguration("")]
-[assembly : AssemblyCompany("http://opensimulator.org")]
-[assembly : AssemblyProduct("OpenSim")]
-[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers")]
-[assembly : AssemblyTrademark("")]
-[assembly : AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly : ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly : Guid("13e7c396-78a9-4a5c-baf2-6f980ea75d95")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-
-[assembly : AssemblyVersion("0.7.5.*")]
-[assembly : AssemblyFileVersion("0.6.5.0")]
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs
deleted file mode 100644
index 97b3b60..0000000
--- a/OpenSim/Framework/Communications/RestClient.cs
+++ /dev/null
@@ -1,438 +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.Generic;
-using System.IO;
-using System.Net;
-using System.Reflection;
-using System.Text;
-using System.Threading;
-using System.Web;
-using log4net;
-
-namespace OpenSim.Framework.Communications
-{
- ///
- /// Implementation of a generic REST client
- ///
- ///
- /// This class is a generic implementation of a REST (Representational State Transfer) web service. This
- /// class is designed to execute both synchronously and asynchronously.
- ///
- /// Internally the implementation works as a two stage asynchronous web-client.
- /// When the request is initiated, RestClient will query asynchronously for for a web-response,
- /// sleeping until the initial response is returned by the server. Once the initial response is retrieved
- /// the second stage of asynchronous requests will be triggered, in an attempt to read of the response
- /// object into a memorystream as a sequence of asynchronous reads.
- ///
- /// The asynchronisity of RestClient is designed to move as much processing into the back-ground, allowing
- /// other threads to execute, while it waits for a response from the web-service. RestClient itself can be
- /// invoked by the caller in either synchronous mode or asynchronous modes.
- ///
- public class RestClient
- {
- private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
- // private string realuri;
-
- #region member variables
-
- ///
- /// The base Uri of the web-service e.g. http://www.google.com
- ///
- private string _url;
-
- ///
- /// Path elements of the query
- ///
- private List _pathElements = new List();
-
- ///
- /// Parameter elements of the query, e.g. min=34
- ///
- private Dictionary _parameterElements = new Dictionary();
-
- ///
- /// Request method. E.g. GET, POST, PUT or DELETE
- ///
- private string _method;
-
- ///
- /// Temporary buffer used to store bytes temporarily as they come in from the server
- ///
- private byte[] _readbuf;
-
- ///
- /// MemoryStream representing the resultiong resource
- ///
- private Stream _resource;
-
- ///
- /// WebRequest object, held as a member variable
- ///
- private HttpWebRequest _request;
-
- ///
- /// WebResponse object, held as a member variable, so we can close it
- ///
- private HttpWebResponse _response;
-
- ///
- /// This flag will help block the main synchroneous method, in case we run in synchroneous mode
- ///
- //public static ManualResetEvent _allDone = new ManualResetEvent(false);
-
- ///
- /// Default time out period
- ///
- //private const int DefaultTimeout = 10*1000; // 10 seconds timeout
-
- ///
- /// Default Buffer size of a block requested from the web-server
- ///
- private const int BufferSize = 4096; // Read blocks of 4 KB.
-
-
- ///
- /// if an exception occours during async processing, we need to save it, so it can be
- /// rethrown on the primary thread;
- ///
- private Exception _asyncException;
-
- #endregion member variables
-
- #region constructors
-
- ///
- /// Instantiate a new RestClient
- ///
- /// Web-service to query, e.g. http://osgrid.org:8003
- public RestClient(string url)
- {
- _url = url;
- _readbuf = new byte[BufferSize];
- _resource = new MemoryStream();
- _request = null;
- _response = null;
- _lock = new object();
- }
-
- private object _lock;
-
- #endregion constructors
-
- ///
- /// Add a path element to the query, e.g. assets
- ///
- /// path entry
- public void AddResourcePath(string element)
- {
- if (isSlashed(element))
- _pathElements.Add(element.Substring(0, element.Length - 1));
- else
- _pathElements.Add(element);
- }
-
- ///
- /// Add a query parameter to the Url
- ///
- /// Name of the parameter, e.g. min
- /// Value of the parameter, e.g. 42
- public void AddQueryParameter(string name, string value)
- {
- try
- {
- _parameterElements.Add(HttpUtility.UrlEncode(name), HttpUtility.UrlEncode(value));
- }
- catch (ArgumentException)
- {
- m_log.Error("[REST]: Query parameter " + name + " is already added.");
- }
- catch (Exception e)
- {
- m_log.Error("[REST]: An exception was raised adding query parameter to dictionary. Exception: {0}",e);
- }
- }
-
- ///
- /// Add a query parameter to the Url
- ///
- /// Name of the parameter, e.g. min
- public void AddQueryParameter(string name)
- {
- try
- {
- _parameterElements.Add(HttpUtility.UrlEncode(name), null);
- }
- catch (ArgumentException)
- {
- m_log.Error("[REST]: Query parameter " + name + " is already added.");
- }
- catch (Exception e)
- {
- m_log.Error("[REST]: An exception was raised adding query parameter to dictionary. Exception: {0}",e);
- }
- }
-
- ///
- /// Web-Request method, e.g. GET, PUT, POST, DELETE
- ///
- public string RequestMethod
- {
- get { return _method; }
- set { _method = value; }
- }
-
- ///
- /// True if string contains a trailing slash '/'
- ///
- /// string to be examined
- /// true if slash is present
- private static bool isSlashed(string s)
- {
- return s.Substring(s.Length - 1, 1) == "/";
- }
-
- ///
- /// Build a Uri based on the initial Url, path elements and parameters
- ///
- /// fully constructed Uri
- private Uri buildUri()
- {
- StringBuilder sb = new StringBuilder();
- sb.Append(_url);
-
- foreach (string e in _pathElements)
- {
- sb.Append("/");
- sb.Append(e);
- }
-
- bool firstElement = true;
- foreach (KeyValuePair kv in _parameterElements)
- {
- if (firstElement)
- {
- sb.Append("?");
- firstElement = false;
- }
- else
- sb.Append("&");
-
- sb.Append(kv.Key);
- if (!string.IsNullOrEmpty(kv.Value))
- {
- sb.Append("=");
- sb.Append(kv.Value);
- }
- }
- // realuri = sb.ToString();
- //m_log.InfoFormat("[REST CLIENT]: RestURL: {0}", realuri);
- return new Uri(sb.ToString());
- }
-
- #region Async communications with server
-
- ///
- /// Async method, invoked when a block of data has been received from the service
- ///
- ///
- private void StreamIsReadyDelegate(IAsyncResult ar)
- {
- try
- {
- Stream s = (Stream) ar.AsyncState;
- int read = s.EndRead(ar);
-
- if (read > 0)
- {
- _resource.Write(_readbuf, 0, read);
- // IAsyncResult asynchronousResult =
- // s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s);
- s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s);
-
- // TODO! Implement timeout, without killing the server
- //ThreadPool.RegisterWaitForSingleObject(asynchronousResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
- }
- else
- {
- s.Close();
- //_allDone.Set();
- }
- }
- catch (Exception e)
- {
- //_allDone.Set();
- _asyncException = e;
- }
- }
-
- #endregion Async communications with server
-
- ///
- /// Perform a synchronous request
- ///
- public Stream Request()
- {
- lock (_lock)
- {
- _request = (HttpWebRequest) WebRequest.Create(buildUri());
- _request.KeepAlive = false;
- _request.ContentType = "application/xml";
- _request.Timeout = 200000;
- _request.Method = RequestMethod;
- _asyncException = null;
-
-// IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
- try
- {
- _response = (HttpWebResponse) _request.GetResponse();
- }
- catch (WebException e)
- {
- HttpWebResponse errorResponse = e.Response as HttpWebResponse;
- if (null != errorResponse && HttpStatusCode.NotFound == errorResponse.StatusCode)
- {
- m_log.Warn("[REST CLIENT] Resource not found (404)");
- }
- else
- {
- m_log.Error("[REST CLIENT] Error fetching resource from server " + _request.Address.ToString());
- m_log.Debug(e.ToString());
- }
-
- return null;
- }
-
- Stream src = _response.GetResponseStream();
- int length = src.Read(_readbuf, 0, BufferSize);
- while (length > 0)
- {
- _resource.Write(_readbuf, 0, length);
- length = src.Read(_readbuf, 0, BufferSize);
- }
-
-
- // TODO! Implement timeout, without killing the server
- // this line implements the timeout, if there is a timeout, the callback fires and the request becomes aborted
- //ThreadPool.RegisterWaitForSingleObject(responseAsyncResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
-
-// _allDone.WaitOne();
- if (_response != null)
- _response.Close();
- if (_asyncException != null)
- throw _asyncException;
-
- if (_resource != null)
- {
- _resource.Flush();
- _resource.Seek(0, SeekOrigin.Begin);
- }
-
- return _resource;
- }
- }
-
- public Stream Request(Stream src)
- {
- _request = (HttpWebRequest) WebRequest.Create(buildUri());
- _request.KeepAlive = false;
- _request.ContentType = "application/xml";
- _request.Timeout = 900000;
- _request.Method = RequestMethod;
- _asyncException = null;
- _request.ContentLength = src.Length;
-
- m_log.InfoFormat("[REST]: Request Length {0}", _request.ContentLength);
- m_log.InfoFormat("[REST]: Sending Web Request {0}", buildUri());
- src.Seek(0, SeekOrigin.Begin);
- m_log.Info("[REST]: Seek is ok");
- Stream dst = _request.GetRequestStream();
- m_log.Info("[REST]: GetRequestStream is ok");
-
- byte[] buf = new byte[1024];
- int length = src.Read(buf, 0, 1024);
- m_log.Info("[REST]: First Read is ok");
- while (length > 0)
- {
- dst.Write(buf, 0, length);
- length = src.Read(buf, 0, 1024);
- }
-
- _response = (HttpWebResponse) _request.GetResponse();
-
-// IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
-
- // TODO! Implement timeout, without killing the server
- // this line implements the timeout, if there is a timeout, the callback fires and the request becomes aborted
- //ThreadPool.RegisterWaitForSingleObject(responseAsyncResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
-
- return null;
- }
-
- #region Async Invocation
-
- public IAsyncResult BeginRequest(AsyncCallback callback, object state)
- {
- ///
- /// In case, we are invoked asynchroneously this object will keep track of the state
- ///
- AsyncResult ar = new AsyncResult(callback, state);
- Util.FireAndForget(RequestHelper, ar);
- return ar;
- }
-
- public Stream EndRequest(IAsyncResult asyncResult)
- {
- AsyncResult ar = (AsyncResult) asyncResult;
-
- // Wait for operation to complete, then return result or
- // throw exception
- return ar.EndInvoke();
- }
-
- private void RequestHelper(Object asyncResult)
- {
- // We know that it's really an AsyncResult object
- AsyncResult ar = (AsyncResult) asyncResult;
- try
- {
- // Perform the operation; if sucessful set the result
- Stream s = Request();
- ar.SetAsCompleted(s, false);
- }
- catch (Exception e)
- {
- // If operation fails, set the exception
- ar.HandleException(e, false);
- }
- }
-
- #endregion Async Invocation
- }
-}
diff --git a/OpenSim/Framework/Communications/XMPP/XmppError.cs b/OpenSim/Framework/Communications/XMPP/XmppError.cs
deleted file mode 100644
index 3d36e9c..0000000
--- a/OpenSim/Framework/Communications/XMPP/XmppError.cs
+++ /dev/null
@@ -1,39 +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.Xml.Serialization;
-
-namespace OpenSim.Framework.Communications.XMPP
-{
- [XmlRoot("error")]
- public class XmppErrorStanza
- {
- public XmppErrorStanza()
- {
- }
- }
-}
diff --git a/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs
deleted file mode 100644
index 12263f4..0000000
--- a/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs
+++ /dev/null
@@ -1,60 +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.Xml.Serialization;
-
-namespace OpenSim.Framework.Communications.XMPP
-{
- ///
- /// An IQ needs to have one of the follow types set.
- ///
- public enum XmppIqType
- {
- [XmlEnum("set")] set,
- [XmlEnum("get")] get,
- [XmlEnum("result")] result,
- [XmlEnum("error")] error,
- }
-
- ///
- /// XmppIqStanza needs to be subclassed as the query content is
- /// specific to the query type.
- ///
- [XmlRoot("iq")]
- public abstract class XmppIqStanza: XmppStanza
- {
- ///
- /// IQ type: one of set, get, result, error
- ///
- [XmlAttribute("type")]
- public XmppIqType Type;
-
- public XmppIqStanza(): base()
- {
- }
- }
-}
diff --git a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
deleted file mode 100644
index 1e8c33e..0000000
--- a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
+++ /dev/null
@@ -1,93 +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.Xml.Serialization;
-
-namespace OpenSim.Framework.Communications.XMPP
-{
- ///
- /// Message types.
- ///
- public enum XmppMessageType
- {
- [XmlEnum("chat")] chat,
- [XmlEnum("error")] error,
- [XmlEnum("groupchat")] groupchat,
- [XmlEnum("headline")] headline,
- [XmlEnum("normal")] normal,
- }
-
- ///
- /// Message body.
- ///
- public class XmppMessageBody
- {
- [XmlText]
- public string Text;
-
- public XmppMessageBody()
- {
- }
-
- public XmppMessageBody(string message)
- {
- Text = message;
- }
-
- new public string ToString()
- {
- return Text;
- }
- }
-
- [XmlRoot("message")]
- public class XmppMessageStanza: XmppStanza
- {
- ///
- /// IQ type: one of set, get, result, error
- ///
- [XmlAttribute("type")]
- public XmppMessageType MessageType;
-
- // [XmlAttribute("error")]
- // public XmppError Error;
-
- [XmlElement("body")]
- public XmppMessageBody Body;
-
- public XmppMessageStanza() : base()
- {
- }
-
- public XmppMessageStanza(string fromJid, string toJid, XmppMessageType mType, string message) :
- base(fromJid, toJid)
- {
- MessageType = mType;
- Body = new XmppMessageBody(message);
- }
- }
-}
diff --git a/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs
deleted file mode 100644
index 4d45ac0..0000000
--- a/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs
+++ /dev/null
@@ -1,69 +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.Xml.Serialization;
-
-namespace OpenSim.Framework.Communications.XMPP
-{
- ///
- /// Message types.
- ///
- public enum XmppPresenceType
- {
- [XmlEnum("unavailable")] unavailable,
- [XmlEnum("subscribe")] subscribe,
- [XmlEnum("subscribed")] subscribed,
- [XmlEnum("unsubscribe")] unsubscribe,
- [XmlEnum("unsubscribed")] unsubscribed,
- [XmlEnum("probe")] probe,
- [XmlEnum("error")] error,
- }
-
-
- [XmlRoot("message")]
- public class XmppPresenceStanza: XmppStanza
- {
- ///
- /// IQ type: one of set, get, result, error
- ///
- [XmlAttribute("type")]
- public XmppPresenceType PresenceType;
-
- // [XmlAttribute("error")]
- // public XmppError Error;
-
- public XmppPresenceStanza() : base()
- {
- }
-
- public XmppPresenceStanza(string fromJid, string toJid, XmppPresenceType pType) :
- base(fromJid, toJid)
- {
- PresenceType = pType;
- }
- }
-}
diff --git a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
deleted file mode 100644
index e37ef28..0000000
--- a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
+++ /dev/null
@@ -1,79 +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.Generic;
-using System.Xml;
-using System.Xml.Serialization;
-
-namespace OpenSim.Framework.Communications.XMPP
-{
- public class XmppSerializer
- {
- // private static readonly ILog _log =
- // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
- // need to do it this way, as XmlSerializer(type, extratypes)
- // does not work on mono (at least).
- private Dictionary _serializerForType = new Dictionary();
- private Dictionary _serializerForName = new Dictionary();
- private XmlSerializerNamespaces _xmlNs;
- private string _defaultNS;
-
- public XmppSerializer(bool server)
- {
- _xmlNs = new XmlSerializerNamespaces();
- _xmlNs.Add(String.Empty, String.Empty);
- if (server)
- _defaultNS = "jabber:server";
- else
- _defaultNS = "jabber:client";
-
- // TODO: do this via reflection
- _serializerForType[typeof(XmppMessageStanza)] = _serializerForName["message"] =
- new XmlSerializer(typeof(XmppMessageStanza), _defaultNS);
- }
-
- public void Serialize(XmlWriter xw, object o)
- {
- if (!_serializerForType.ContainsKey(o.GetType()))
- throw new ArgumentException(String.Format("no serializer available for type {0}", o.GetType()));
-
- _serializerForType[o.GetType()].Serialize(xw, o, _xmlNs);
- }
-
- public object Deserialize(XmlReader xr)
- {
- // position on next element
- xr.Read();
- if (!_serializerForName.ContainsKey(xr.LocalName))
- throw new ArgumentException(String.Format("no serializer available for name {0}", xr.LocalName));
-
- return _serializerForName[xr.LocalName].Deserialize(xr);
- }
- }
-}
diff --git a/OpenSim/Framework/Communications/XMPP/XmppStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppStanza.cs
deleted file mode 100644
index 5312a31..0000000
--- a/OpenSim/Framework/Communications/XMPP/XmppStanza.cs
+++ /dev/null
@@ -1,70 +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.Xml.Serialization;
-
-namespace OpenSim.Framework.Communications.XMPP
-{
- public abstract class XmppStanza
- {
- ///
- /// counter used for generating ID
- ///
- [XmlIgnore]
- private static ulong _ctr = 0;
-
- ///
- /// recipient JID
- ///
- [XmlAttribute("to")]
- public string ToJid;
-
- ///
- /// sender JID
- ///
- [XmlAttribute("from")]
- public string FromJid;
-
- ///
- /// unique ID.
- ///
- [XmlAttribute("id")]
- public string MessageId;
-
- public XmppStanza()
- {
- }
-
- public XmppStanza(string fromJid, string toJid)
- {
- ToJid = toJid;
- FromJid = fromJid;
- MessageId = String.Format("OpenSim_{0}{1}", DateTime.UtcNow.Ticks, _ctr++);
- }
- }
-}
diff --git a/OpenSim/Framework/Communications/XMPP/XmppWriter.cs b/OpenSim/Framework/Communications/XMPP/XmppWriter.cs
deleted file mode 100644
index 415d808..0000000
--- a/OpenSim/Framework/Communications/XMPP/XmppWriter.cs
+++ /dev/null
@@ -1,57 +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.IO;
-using System.Text;
-using System.Xml;
-using IOStream = System.IO.Stream;
-
-namespace OpenSim.Framework.Communications.XMPP
-{
- public class XMPPWriter: XmlTextWriter
- {
- public XMPPWriter(TextWriter textWriter) : base(textWriter)
- {
- }
-
- public XMPPWriter(IOStream stream) : this(stream, Util.UTF8)
- {
- }
-
- public XMPPWriter(IOStream stream, Encoding enc) : base(stream, enc)
- {
- }
-
- public override void WriteStartDocument()
- {
- }
-
- public override void WriteStartDocument(bool standalone)
- {
- }
- }
-}
--
cgit v1.1