Revert changes to exchange 2013 provider

Fix applied on deadlock for scheduled task
Support added to server configuration for powershell remoting
This commit is contained in:
robvde 2013-03-04 18:31:13 +04:00
parent 484e7102b8
commit b00e11a2b9
7 changed files with 108 additions and 4 deletions

View file

@ -192,4 +192,10 @@
<data name="locMailboxDAG.Text" xml:space="preserve">
<value>Database Availability Group:</value>
</data>
<data name="lblPowerShellUrl.Text" xml:space="preserve">
<value>e.g. http://server.domain.com/PowerShell</value>
</data>
<data name="locPowerShellUrl.Text" xml:space="preserve">
<value>Powershell URL:</value>
</data>
</root>

View file

@ -1,6 +1,25 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Exchange_Settings.ascx.cs"
Inherits="WebsitePanel.Portal.ProviderControls.Exchange2010_Settings" %>
<table cellpadding="3" cellspacing="0" width="100%">
<tr runat="server" id="powershellUrl1" width="200" nowrap>
<td class="SubHead">
</td>
<td>
<asp:Label runat="server" ID="lblFileServiceInfo" meta:resourcekey="lblPowerShellUrl" Text="e.g. http://server.domain.com/PowerShell" Font-Italic="true"></asp:Label>
</td>
</tr>
<tr runat="server" id="powershellUrl2" width="200" nowrap>
<td class="SubHead">
<asp:Localize ID="loclocPowerShellUrl" runat="server" meta:resourcekey="locPowerShellUrl"
Text="Powershell URL:"></asp:Localize>
</td>
<td>
<asp:TextBox ID="txtPowerShellUrl" runat="server" Width="400px"></asp:TextBox>
</td>
</tr>
<tr runat="server" id="storageGroup">
<td class="SubHead" width="200" nowrap>
<asp:Localize ID="locStorageGroup" runat="server" meta:resourcekey="locStorageGroup" Text="Storage Group Name:"></asp:Localize>

View file

@ -91,6 +91,8 @@ namespace WebsitePanel.Portal.ProviderControls
txtStorageGroup.Text = "";
locMailboxDAG.Visible = false;
powershellUrl1.Visible = powershellUrl2.Visible = false;
break;
case EXCHANGE2010SP2_PROVIDER_ID:
@ -101,6 +103,7 @@ namespace WebsitePanel.Portal.ProviderControls
txtStorageGroup.Text = "";
locMailboxDatabase.Visible = false;
powershellUrl1.Visible = powershellUrl2.Visible = false;
break;
case EXCHANGE2013_PROVIDER_ID:
@ -111,6 +114,7 @@ namespace WebsitePanel.Portal.ProviderControls
txtStorageGroup.Text = "";
locMailboxDatabase.Visible = false;
powershellUrl1.Visible = powershellUrl2.Visible = true;
break;
default:
@ -147,6 +151,7 @@ namespace WebsitePanel.Portal.ProviderControls
txtActiveSyncServer.Text = settings["ActiveSyncServer"];
txtOABServer.Text = settings["OABServer"];
txtPublicFolderServer.Text = settings["PublicFolderServer"];
txtPowerShellUrl.Text = settings["PowerShellUrl"];
UpdateHubTransportsGrid();
UpdateClientAccessGrid();
@ -173,6 +178,7 @@ namespace WebsitePanel.Portal.ProviderControls
settings["PublicFolderServer"] = txtPublicFolderServer.Text;
settings["StorageGroup"] = txtStorageGroup.Text;
settings["PowerShellUrl"] = txtPowerShellUrl.Text;
}
public void BindExchangeServices(DropDownList ddl, bool isHubservice)

View file

@ -12,6 +12,51 @@ namespace WebsitePanel.Portal.ProviderControls {
public partial class Exchange2010_Settings {
/// <summary>
/// powershellUrl1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTableRow powershellUrl1;
/// <summary>
/// lblFileServiceInfo control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblFileServiceInfo;
/// <summary>
/// powershellUrl2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTableRow powershellUrl2;
/// <summary>
/// loclocPowerShellUrl control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Localize loclocPowerShellUrl;
/// <summary>
/// txtPowerShellUrl control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtPowerShellUrl;
/// <summary>
/// storageGroup control.
/// </summary>