Significant amount of changes to hosted organizations and exchange:

Exchange 2010 SP2 provisioning separated through a new provider
Exchange 2010 SP2 now compliant with product group guidelines
Support for Database Availability Group
Fixed Distribution List view scope to only tenant
Consumer support (individual mailboxes as hotmail) added
Mailbox configuration moved to mailbox plans concept
CN creation is now based on UPN
sAMAccountName generation revised and decoupled from tenant name
2007 (ACL Based), 2010 (ACL Bases), 2010 SP2 (ABP) supported
Automated Hosted Organization provisioning added to create hosting space
Enterprise Server webservice extended with ImportMethod
Mobile tab fixed
Added more information to users listview
This commit is contained in:
robvde 2012-07-09 12:03:24 +04:00
parent 2f8a580846
commit 50f2c43315
194 changed files with 12994 additions and 9755 deletions

View file

@ -1,147 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="locDomainTemplates.Text" xml:space="preserve">
<value>Domain Templates</value>
</data>
<data name="locEcpDomain.Text" xml:space="preserve">
<value>Exchange Control Panel URL:</value>
</data>
<data name="locEcpURLDescr.Text" xml:space="preserve">
<value>You can use [DOMAIN_NAME] variable for organization default domain.</value>
</data>
<data name="locOfferID.Text" xml:space="preserve">
<value>Offer ID:</value>
</data>
<data name="locOrganizationTemplate.Text" xml:space="preserve">
<value>Organization Template</value>
</data>
<data name="locProgramID.Text" xml:space="preserve">
<value>Program ID:</value>
</data>
<data name="locTemporaryDomain.Text" xml:space="preserve">
<value>Temporary domain:</value>
</data>
<data name="requireOfferID.Text" xml:space="preserve">
<value>*</value>
</data>
<data name="requireProgramID.Text" xml:space="preserve">
<value>*</value>
</data>
</root>

View file

@ -112,10 +112,10 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="lblSetupVariables.Text" xml:space="preserve">
<value>Setup Instruction Variables</value>
@ -189,4 +189,7 @@
<data name="locPublicFolderServer.Text" xml:space="preserve">
<value>Public Folder Server:</value>
</data>
<data name="locMailboxDAG.Text" xml:space="preserve">
<value>Database Availability Group:</value>
</data>
</root>

View file

@ -1,63 +0,0 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Exchange2010SP1_Settings.ascx.cs" Inherits="WebsitePanel.Portal.ProviderControls.Exchange2010SP1_Settings" %>
<fieldset>
<legend><asp:Localize ID="locOrganizationTemplate" runat="server" meta:resourcekey="locOrganizationTemplate">Organization Template</asp:Localize></legend>
<table>
<tr>
<td style="width:150px;"><asp:Localize ID="locProgramID" runat="server" meta:resourcekey="locProgramID">Program ID:</asp:Localize></td>
<td>
<asp:TextBox ID="programID" runat="server" Width="200"></asp:TextBox>
<asp:RequiredFieldValidator ID="requireProgramID" runat="server" ControlToValidate="programID" Display="Dynamic" Text="*" SetFocusOnError="true"></asp:RequiredFieldValidator>
</td>
</tr>
<tr>
<td><asp:Localize ID="locOfferID" runat="server" meta:resourcekey="locOfferID">Offer ID:</asp:Localize></td>
<td>
<asp:TextBox ID="offerID" runat="server" Width="200"></asp:TextBox>
<asp:RequiredFieldValidator ID="requireOfferID" runat="server" ControlToValidate="offerID" Display="Dynamic" Text="*" SetFocusOnError="true"></asp:RequiredFieldValidator>
</td>
</tr>
<%--
<tr>
<td><asp:Localize ID="locLocation" runat="server" meta:resourcekey="locLocation">Location:</asp:Localize></td>
<td>
<asp:TextBox ID="location" runat="server" Width="50"></asp:TextBox>
<asp:RequiredFieldValidator ID="requireLocation" runat="server" ControlToValidate="location" Display="Dynamic" Text="*" SetFocusOnError="true"></asp:RequiredFieldValidator>
<asp:RangeValidator ID="rangeLocation" runat="server"
meta:resourcekey="rangeLocation" ControlToValidate="location" Display="Dynamic"
Text="Must be a number between 1000 and 2000" MinimumValue="1000"
MaximumValue="2000" SetFocusOnError="true" Type="Integer"></asp:RangeValidator>
</td>
</tr>
--%>
</table>
</fieldset>
<%--
<fieldset>
<legend><asp:Localize ID="locCatchAll" runat="server" meta:resourcekey="locCatchAll">Catch-All</asp:Localize></legend>
<table>
<tr>
<td style="width:150px;"><asp:Localize ID="locCatchAllPath" runat="server" meta:resourcekey="locCatchAllPath">Catch-all configuration path:</asp:Localize></td>
<td><asp:TextBox ID="catchAllPath" runat="server" Width="300"></asp:TextBox></td>
</tr>
</table>
</fieldset>
--%>
<fieldset>
<legend><asp:Localize ID="locDomainTemplates" runat="server" meta:resourcekey="locDomainTemplates">Domain Templates</asp:Localize></legend>
<table>
<tr>
<td style="width:150px;"><asp:Localize ID="locTemporaryDomain" runat="server" meta:resourcekey="locTemporaryDomain">Temporary domain:</asp:Localize></td>
<td>organization_domain.<asp:TextBox ID="temporaryDomain" runat="server" Width="200"></asp:TextBox></td>
</tr>
<tr>
<td valign="top"><asp:Localize ID="locEcpURL" runat="server" meta:resourcekey="locEcpDomain">Exchange Control Panel URL:</asp:Localize></td>
<td valign="top">
<asp:TextBox ID="ecpURL" runat="server" Width="300"></asp:TextBox><br />
<asp:Localize ID="locEcpURLDescr" runat="server" meta:resourcekey="locEcpURLDescr">You can use [DOMAIN_NAME] variable for organization default domain.</asp:Localize>
</td>
</tr>
</table>
</fieldset>

View file

@ -1,41 +0,0 @@
using System;
using System.Collections.Generic;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Collections.Specialized;
namespace WebsitePanel.Portal.ProviderControls
{
public partial class Exchange2010SP1_Settings : WebsitePanelControlBase, IHostingServiceProviderSettings
{
protected void Page_Load(object sender, EventArgs e)
{
}
public void BindSettings(StringDictionary settings)
{
programID.Text = settings["programID"];
offerID.Text = settings["offerID"];
//location.Text = settings["location"];
//catchAllPath.Text = settings["catchAllPath"];
temporaryDomain.Text = settings["temporaryDomain"];
ecpURL.Text = settings["ecpURL"];
}
public void SaveSettings(StringDictionary settings)
{
settings["programID"] = programID.Text.Trim();
settings["offerID"] = offerID.Text.Trim();
//settings["location"] = location.Text.Trim();
//settings["catchAllPath"] = catchAllPath.Text.Trim();
settings["temporaryDomain"] = temporaryDomain.Text.Trim();
settings["ecpURL"] = ecpURL.Text.Trim();
}
}
}

View file

@ -1,132 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace WebsitePanel.Portal.ProviderControls {
public partial class Exchange2010SP1_Settings {
/// <summary>
/// locOrganizationTemplate 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 locOrganizationTemplate;
/// <summary>
/// locProgramID 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 locProgramID;
/// <summary>
/// programID 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 programID;
/// <summary>
/// requireProgramID 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.RequiredFieldValidator requireProgramID;
/// <summary>
/// locOfferID 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 locOfferID;
/// <summary>
/// offerID 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 offerID;
/// <summary>
/// requireOfferID 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.RequiredFieldValidator requireOfferID;
/// <summary>
/// locDomainTemplates 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 locDomainTemplates;
/// <summary>
/// locTemporaryDomain 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 locTemporaryDomain;
/// <summary>
/// temporaryDomain 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 temporaryDomain;
/// <summary>
/// locEcpURL 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 locEcpURL;
/// <summary>
/// ecpURL 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 ecpURL;
/// <summary>
/// locEcpURLDescr 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 locEcpURLDescr;
}
}

View file

@ -13,11 +13,14 @@
<td class="SubHead" width="200" nowrap>
<asp:Localize ID="locMailboxDatabase" runat="server" meta:resourcekey="locMailboxDatabase"
Text="Mailbox Database Name:"></asp:Localize>
<asp:Localize ID="locMailboxDAG" runat="server" meta:resourcekey="locMailboxDAG"
Text="Database Availability Group:"></asp:Localize>
</td>
<td>
<asp:TextBox ID="txtMailboxDatabase" runat="server" Width="200px"></asp:TextBox>
</td>
</tr>
<tr>
<td class="SubHead">
<asp:Localize ID="locKeepDeletedItems" runat="server" meta:resourcekey="locKeepDeletedItems"

View file

@ -41,7 +41,8 @@ namespace WebsitePanel.Portal.ProviderControls
public const string ClientAccessData = "ClientAccessData";
public const int EXCHANGE2010_PROVIDER_ID = 32;
public const int EXCHANGE2010_PROVIDER_ID = 32;
public const int EXCHANGE2010SP2_PROVIDER_ID = 90;
public string HubTransports
{
@ -78,21 +79,36 @@ namespace WebsitePanel.Portal.ProviderControls
ServiceInfo serviceInfo = ES.Services.Servers.GetServiceInfo(PanelRequest.ServiceId);
if (serviceInfo != null)
{
if (serviceInfo.ProviderId == EXCHANGE2010_PROVIDER_ID)
switch (serviceInfo.ProviderId)
{
clusteredMailboxServer.Visible = false;
txtMailboxClusterName.Text = "";
case EXCHANGE2010_PROVIDER_ID:
clusteredMailboxServer.Visible = false;
txtMailboxClusterName.Text = "";
storageGroup.Visible = false;
txtStorageGroup.Text = "";
}
else
{
storageGroup.Visible = true;
txtStorageGroup.Text = settings["StorageGroup"];
clusteredMailboxServer.Visible = true;
txtMailboxClusterName.Text = settings["MailboxCluster"];
storageGroup.Visible = false;
txtStorageGroup.Text = "";
locMailboxDAG.Visible = false;
break;
case EXCHANGE2010SP2_PROVIDER_ID:
clusteredMailboxServer.Visible = false;
txtMailboxClusterName.Text = "";
storageGroup.Visible = false;
txtStorageGroup.Text = "";
locMailboxDatabase.Visible = false;
break;
default:
storageGroup.Visible = true;
txtStorageGroup.Text = settings["StorageGroup"];
clusteredMailboxServer.Visible = true;
txtMailboxClusterName.Text = settings["MailboxCluster"];
locMailboxDAG.Visible = false;
break;
}
}

View file

@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3053
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
@ -49,6 +48,15 @@ namespace WebsitePanel.Portal.ProviderControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Localize locMailboxDatabase;
/// <summary>
/// locMailboxDAG 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 locMailboxDAG;
/// <summary>
/// txtMailboxDatabase control.
/// </summary>