[Nmailserver-commits] SF.net SVN: nmailserver: [228] NMail/trunk
Brought to you by:
dframpton-oss,
tmyroadctfig
Menu
▾
▴
[Nmailserver-commits] SF.net SVN: nmailserver: [228] NMail/trunk
|
From: <tmy...@us...> - 2007-06-16 15:04:06
|
Revision: 228
http://svn.sourceforge.net/nmailserver/?rev=228&view=rev
Author: tmyroadctfig
Date: 2007-06-16 08:04:06 -0700 (Sat, 16 Jun 2007)
Log Message:
-----------
Fixed remote access interface to use new ILocalStore interface.
Modified Paths:
--------------
NMail/trunk/NMail.Administration.Web/App_Code/FolderDataSource.cs
NMail/trunk/NMail.Administration.Web/App_Code/MailDomainDataSource.cs
NMail/trunk/NMail.Administration.Web/App_Code/SpooledMessageDataSource.cs
NMail/trunk/NMail.Administration.Web/App_Code/UserDataSource.cs
NMail/trunk/NMail.RemoteAccessService/App_Code/RemoteAccessService.cs
Added Paths:
-----------
NMail/trunk/NMail.RemoteAccessService/App_Data/Global.asax
Removed Paths:
-------------
NMail/trunk/NMail.RemoteAccessService/Global.asax
Modified: NMail/trunk/NMail.Administration.Web/App_Code/FolderDataSource.cs
===================================================================
--- NMail/trunk/NMail.Administration.Web/App_Code/FolderDataSource.cs 2007-06-16 15:02:35 UTC (rev 227)
+++ NMail/trunk/NMail.Administration.Web/App_Code/FolderDataSource.cs 2007-06-16 15:04:06 UTC (rev 228)
@@ -70,14 +70,14 @@
/// </summary>
/// <param name="folderId">The Id of the folder to get the sub-folders for.</param>
/// <returns>The list of folders.</returns>
- public static List<StoreFolder> GetSubFolders(int folderId)
+ public static IList<StoreFolder> GetSubFolders(int folderId)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
StoreFolder parent = localStore.GetStoreFolder(authToken, folderId);
- return new List<StoreFolder>(localStore.GetChildren(authToken, parent));
+ return localStore.GetChildren(authToken, parent.FolderId);
}
/// <summary>
@@ -85,13 +85,12 @@
/// </summary>
/// <param name="folderId">The Id of the folder to delete.</param>
/// <returns>The result of the attempt to delete the folder.</returns>
- public static LocalStoreFolderResult DeleteFolder(int folderId)
+ public static void DeleteFolder(int folderId)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
-
- return localStore.DeleteFolder(authToken, folderId);
+ localStore.DeleteFolder(authToken, folderId);
}
/// <summary>
@@ -99,13 +98,12 @@
/// </summary>
/// <param name="folderName">The name of the folder to create.</param>
/// <returns>The result of the attempt to create the folder.</returns>
- public static LocalStoreFolderResult CreateFolder(string folderName)
+ public static void CreateFolder(string folderName)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
-
- return localStore.CreateFolder(authToken, folderName);
+ localStore.CreateFolder(authToken, folderName);
}
#endregion
@@ -149,7 +147,7 @@
StoreFolder folder = localStore.GetStoreFolder(authToken, folderId);
GenericAce<StoreFolderPrivilege> ace = new GenericAce<StoreFolderPrivilege>(identifier, privilege, aceType);
- localStore.SetStoreFolderAce(authToken, folder, ace);
+ localStore.SetStoreFolderAce(authToken, folder.FolderId, ace);
}
/// <summary>
@@ -164,7 +162,7 @@
ILocalStore localStore = (ILocalStore)session["LocalStore"];
StoreFolder folder = localStore.GetStoreFolder(authToken, folderId);
- localStore.RemoveStoreFolderAce(authToken, folder, identifier);
+ localStore.RemoveStoreFolderAce(authToken, folder.FolderId, identifier);
}
#endregion
}
Modified: NMail/trunk/NMail.Administration.Web/App_Code/MailDomainDataSource.cs
===================================================================
--- NMail/trunk/NMail.Administration.Web/App_Code/MailDomainDataSource.cs 2007-06-16 15:02:35 UTC (rev 227)
+++ NMail/trunk/NMail.Administration.Web/App_Code/MailDomainDataSource.cs 2007-06-16 15:04:06 UTC (rev 228)
@@ -22,15 +22,13 @@
/// </summary>
public static class MailDomainDataSource
{
- public static List<MailDomain> GetMailDomains()
+ public static IList<MailDomain> GetMailDomains()
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
- MailDomain[] mailDomains = localStore.GetMailDomains(authToken);
-
- return new List<MailDomain>(mailDomains);
+ return localStore.GetMailDomains(authToken);
}
public static MailDomain GetMailDomain(int mailDomainId)
@@ -39,7 +37,7 @@
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
- MailDomain[] mailDomains = localStore.GetMailDomains(authToken);
+ IList<MailDomain> mailDomains = localStore.GetMailDomains(authToken);
foreach (MailDomain mailDomain in mailDomains)
{
@@ -58,7 +56,7 @@
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
- MailDomain[] mailDomains = localStore.GetMailDomains(authToken);
+ IList<MailDomain> mailDomains = localStore.GetMailDomains(authToken);
foreach (MailDomain mailDomain in mailDomains)
{
@@ -71,13 +69,12 @@
return null;
}
- public static LocalStoreMailDomainResult UpdateMailDomain(MailDomain updatedMailDomain)
+ public static void UpdateMailDomain(MailDomain updatedMailDomain)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
-
- return localStore.UpdateMailDomain(authToken, updatedMailDomain);
+ localStore.UpdateMailDomain(authToken, updatedMailDomain);
}
public static void AddMailboxMapping(int mailDomainId, Type mappingType)
@@ -90,22 +87,20 @@
throw new NotImplementedException();
}
- public static LocalStoreMailDomainResult CreateMailDomain(Host primaryHost)
+ public static void CreateMailDomain(Host primaryHost)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
-
- return localStore.CreateMailDomain(authToken, primaryHost);
+ localStore.CreateMailDomain(authToken, new MailDomain(0, primaryHost));
}
- public static LocalStoreMailDomainResult DeleteMailDomain(int mailDomainId)
+ public static void DeleteMailDomain(int mailDomainId)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
-
- return localStore.DeleteMailDomain(authToken, mailDomainId);
+ localStore.DeleteMailDomain(authToken, mailDomainId);
}
public static List<LocalStoreUser> GetMailDomainUsers(int mailDomainId)
@@ -126,7 +121,7 @@
return users;
}
- public static LocalStoreMailDomainResult AddUser(int mailDomainId, int userId)
+ public static void AddUser(int mailDomainId, int userId)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
@@ -136,15 +131,14 @@
if (mailDomain == null)
{
- return LocalStoreMailDomainResult.NoSuchMailDomain;
+ throw new ArgumentException("Invalid mail domain.");
}
mailDomain.UserIds.Add(userId);
-
- return localStore.UpdateMailDomain(authToken, mailDomain);
+ localStore.UpdateMailDomain(authToken, mailDomain);
}
- public static LocalStoreMailDomainResult RemoveUser(int mailDomainId, int userId)
+ public static void RemoveUser(int mailDomainId, int userId)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
@@ -154,17 +148,16 @@
if (mailDomain == null)
{
- return LocalStoreMailDomainResult.NoSuchMailDomain;
+ throw new ArgumentException("Invalid mail domain.");
}
if (!mailDomain.UserIds.Contains(userId))
{
- return LocalStoreMailDomainResult.NoSuchUser;
+ throw new ArgumentException("Invalid user.");
}
mailDomain.UserIds.Remove(userId);
-
- return localStore.UpdateMailDomain(authToken, mailDomain);
+ localStore.UpdateMailDomain(authToken, mailDomain);
}
public static List<ILocalStoreUserMap> GetMailboxMappings(int mailDomainId)
Modified: NMail/trunk/NMail.Administration.Web/App_Code/SpooledMessageDataSource.cs
===================================================================
--- NMail/trunk/NMail.Administration.Web/App_Code/SpooledMessageDataSource.cs 2007-06-16 15:02:35 UTC (rev 227)
+++ NMail/trunk/NMail.Administration.Web/App_Code/SpooledMessageDataSource.cs 2007-06-16 15:04:06 UTC (rev 228)
@@ -16,7 +16,7 @@
{
public static class SpooledMessageDataSource
{
- public static List<SpoolEnvelope> GetSpooledMessages()
+ public static IList<SpoolEnvelope> GetSpooledMessages()
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
ISpoolService spool = (ISpoolService)session["Spool"];
Modified: NMail/trunk/NMail.Administration.Web/App_Code/UserDataSource.cs
===================================================================
--- NMail/trunk/NMail.Administration.Web/App_Code/UserDataSource.cs 2007-06-16 15:02:35 UTC (rev 227)
+++ NMail/trunk/NMail.Administration.Web/App_Code/UserDataSource.cs 2007-06-16 15:04:06 UTC (rev 228)
@@ -26,15 +26,13 @@
/// Gets all users in the system.
/// </summary>
/// <returns>The list of users.</returns>
- public static List<LocalStoreUser> GetUsers()
+ public static IList<LocalStoreUser> GetUsers()
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
- LocalStoreUser[] users = localStore.GetUsers(authToken);
-
- return new List<LocalStoreUser>(users);
+ return localStore.GetUsers(authToken);
}
/// <summary>
@@ -60,13 +58,12 @@
return localStore.GetUser(authToken, userId);
}
- public static LocalStoreUserResult DeleteUser(int userId)
+ public static void DeleteUser(int userId)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
-
- return localStore.DeleteUser(authToken, userId);
+ localStore.DeleteUser(authToken, userId);
}
public static List<StoreFolder> GetUserFolders(int userId)
@@ -78,13 +75,16 @@
return new List<StoreFolder>(localStore.GetUserFolders(authToken, userId));
}
- public static LocalStoreUserResult CreateUesr(string Username, int? QuotaWarnLimit, int? QuotaHardLimit)
+ public static void CreateUesr(string Username, int? QuotaWarnLimit, int? QuotaHardLimit)
{
IHttpSessionState session = SessionStateUtility.GetHttpSessionStateFromContext(HttpContext.Current);
IAuthenticationToken authToken = (IAuthenticationToken)session["AuthToken"];
ILocalStore localStore = (ILocalStore)session["LocalStore"];
-
- return localStore.CreateUser(authToken, Username, QuotaWarnLimit, QuotaHardLimit);
+ LocalStoreUser user = new LocalStoreUser();
+ user.Username = Username;
+ user.QuotaHardLimit = QuotaHardLimit;
+ user.QuotaWarnLimit = QuotaWarnLimit;
+ localStore.CreateUser(authToken, user);
}
}
}
Modified: NMail/trunk/NMail.RemoteAccessService/App_Code/RemoteAccessService.cs
===================================================================
--- NMail/trunk/NMail.RemoteAccessService/App_Code/RemoteAccessService.cs 2007-06-16 15:02:35 UTC (rev 227)
+++ NMail/trunk/NMail.RemoteAccessService/App_Code/RemoteAccessService.cs 2007-06-16 15:04:06 UTC (rev 228)
@@ -9,6 +9,7 @@
using NMail.Authentication;
using NMail.DataTypes;
using NMail.DataTypes.LocalStore;
+using NMail.DataTypes.Message;
using NMail.Server;
using NMail.RemoteAccessService.Serializers.DataTypes;
using NMail.RemoteAccessService.Serializers.DataTypes.LocalStore;
@@ -168,36 +169,36 @@
if (storeFolder != null)
{
- addMessageCount(currentList, ServiceState.RemoteAdmin.NMailServer.LocalStore.GetMessageCount(token, storeFolder));
+ addMessageCount(currentList, ServiceState.RemoteAdmin.NMailServer.LocalStore.GetMessageCount(token, storeFolder.FolderId));
if ((messageFlags & StoreMessageFlags.Answered) != 0)
{
- addMessageCount(currentList, ServiceState.RemoteAdmin.NMailServer.LocalStore.GetMessageCountWithFlags(token, storeFolder, StoreMessageFlags.Answered));
+ addMessageCount(currentList, ServiceState.RemoteAdmin.NMailServer.LocalStore.GetMessageCountWithFlags(token, storeFolder.FolderId, StoreMessageFlags.Answered));
}
if ((messageFlags & StoreMessageFlags.Deleted) != 0)
{
- addMessageCount(currentList, ServiceState.RemoteAdmin.NMailServer.LocalStore.GetMessageCountWithFlags(token, storeFolder, StoreMessageFlags.Deleted));
+ addMessageCount(currentList, ServiceState.RemoteAdmin.NMailServer.LocalStore.GetMessageCountWithFlags(token, storeFolder.FolderId, StoreMessageFlags.Deleted));
}
if ((messageFlags & StoreMessageFlags.Draft) != 0)
{
- addMessageCount(currentList, ServiceState.RemoteAdmin.NMailServer.LocalStore.GetMessageCountWithFlags(token, storeFolder, StoreMessageFlags.Draft));
+ addMessageCount(currentList, ServiceState.RemoteAdmin.NMailServer.LocalStore.GetMessageCountWithFlags(token, storeFolder.FolderId, StoreMessageFlags.Draft));
}
if ((messageFlags & StoreMessageFlags.Flagged) != 0)
{
- addMessageCount(currentList, ServiceState.RemoteAdmin.NMailServer.LocalStore.GetMessageCountWithFlags(token, storeFolder, StoreMessageFlags.Flagged));
+ addMessageCount(currentList, ServiceState.RemoteAdmin.NMailServer.LocalStore.GetMessageCountWithFlags(token, storeFolder.FolderId, StoreMessageFlags.Flagged));
}
if ((messageFlags & StoreMessageFlags.Recent) != 0)
{
- addMessageCount(currentList, ServiceState.RemoteAdmin.NMailServer.LocalStore.GetMessageCountWithFlags(token, storeFolder, StoreMessageFlags.Recent));
+ addMessageCount(currentList, ServiceState.RemoteAdmin.NMailServer.LocalStore.GetMessageCountWithFlags(token, storeFolder.FolderId, StoreMessageFlags.Recent));
}
if ((messageFlags & StoreMessageFlags.Seen) != 0)
{
- addMessageCount(currentList, ServiceState.RemoteAdmin.NMailServer.LocalStore.GetMessageCountWithFlags(token, storeFolder, StoreMessageFlags.Seen));
+ addMessageCount(currentList, ServiceState.RemoteAdmin.NMailServer.LocalStore.GetMessageCountWithFlags(token, storeFolder.FolderId, StoreMessageFlags.Seen));
}
}
else
@@ -232,7 +233,7 @@
if (token != null)
{
List<KeyValuePair<int, EnvelopeSerializer>> result = new List<KeyValuePair<int, EnvelopeSerializer>>();
- List<int> messageIds = ServiceState.RemoteAdmin.NMailServer.LocalStore.GetMessageIds(token, folderId);
+ IList<int> messageIds = ServiceState.RemoteAdmin.NMailServer.LocalStore.GetMessageIds(token, folderId);
foreach (int messageId in messageIds)
{
@@ -361,7 +362,7 @@
public TValue Value
{
get { return value;}
- set { value = value;}
+ set { this.value = value;}
}
}
}
Added: NMail/trunk/NMail.RemoteAccessService/App_Data/Global.asax
===================================================================
--- NMail/trunk/NMail.RemoteAccessService/App_Data/Global.asax (rev 0)
+++ NMail/trunk/NMail.RemoteAccessService/App_Data/Global.asax 2007-06-16 15:04:06 UTC (rev 228)
@@ -0,0 +1,39 @@
+<%@ Application Language="C#" %>
+
+<script runat="server">
+
+ void Application_Start(object sender, EventArgs e)
+ {
+ Hashtable properties = new Hashtable();
+ properties.Add("secure", true);
+ System.Runtime.Remoting.Channels.ChannelServices.RegisterChannel(new System.Runtime.Remoting.Channels.Tcp.TcpClientChannel(properties, null), false);
+ }
+
+ void Application_End(object sender, EventArgs e)
+ {
+ // Code that runs on application shutdown
+
+ }
+
+ void Application_Error(object sender, EventArgs e)
+ {
+ // Code that runs when an unhandled error occurs
+
+ }
+
+ void Session_Start(object sender, EventArgs e)
+ {
+ // Code that runs when a new session is started
+
+ }
+
+ void Session_End(object sender, EventArgs e)
+ {
+ // Code that runs when a session ends.
+ // Note: The Session_End event is raised only when the sessionstate mode
+ // is set to InProc in the Web.config file. If session mode is set to StateServer
+ // or SQLServer, the event is not raised.
+
+ }
+
+</script>
Deleted: NMail/trunk/NMail.RemoteAccessService/Global.asax
===================================================================
--- NMail/trunk/NMail.RemoteAccessService/Global.asax 2007-06-16 15:02:35 UTC (rev 227)
+++ NMail/trunk/NMail.RemoteAccessService/Global.asax 2007-06-16 15:04:06 UTC (rev 228)
@@ -1,39 +0,0 @@
-<%@ Application Language="C#" %>
-
-<script runat="server">
-
- void Application_Start(object sender, EventArgs e)
- {
- Hashtable properties = new Hashtable();
- properties.Add("secure", true);
- System.Runtime.Remoting.Channels.ChannelServices.RegisterChannel(new System.Runtime.Remoting.Channels.Tcp.TcpClientChannel(properties, null), false);
- }
-
- void Application_End(object sender, EventArgs e)
- {
- // Code that runs on application shutdown
-
- }
-
- void Application_Error(object sender, EventArgs e)
- {
- // Code that runs when an unhandled error occurs
-
- }
-
- void Session_Start(object sender, EventArgs e)
- {
- // Code that runs when a new session is started
-
- }
-
- void Session_End(object sender, EventArgs e)
- {
- // Code that runs when a session ends.
- // Note: The Session_End event is raised only when the sessionstate mode
- // is set to InProc in the Web.config file. If session mode is set to StateServer
- // or SQLServer, the event is not raised.
-
- }
-
-</script>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
