zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
jretkowski 2012-08-01 16:18:04 -07:00
commit 922b58df16
25 changed files with 1046 additions and 449 deletions
Download patch file Download diff file Expand all files Collapse all files

6
WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Loader.cs
View file

@ -1,4 +1,4 @@
// Copyright (c) 2012, Outercurve Foundation. // Copyright (c) 2012, Outercurve Foundation.
// All rights reserved. // All rights reserved.
// //
// Redistribution and use in source and binary forms, with or without modification, // Redistribution and use in source and binary forms, with or without modification,
@ -80,7 +80,7 @@ namespace WebsitePanel.Installer.Core
private WebClient fileLoader; private WebClient fileLoader;
public BitlyLoader(string remoteFile) internal BitlyLoader(string remoteFile)
: base(remoteFile) : base(remoteFile)
{ {
InitFileLoader(); InitFileLoader();
@ -175,7 +175,7 @@ namespace WebsitePanel.Installer.Core
public event EventHandler<LoaderEventArgs<Int32>> ProgressChanged; public event EventHandler<LoaderEventArgs<Int32>> ProgressChanged;
public event EventHandler<EventArgs> OperationCompleted; public event EventHandler<EventArgs> OperationCompleted;
public Loader(string remoteFile) internal Loader(string remoteFile)
{ {
this.remoteFile = remoteFile; this.remoteFile = remoteFile;
} }

BIN
WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe
View file

Binary file not shown.

18
WebsitePanel.Installer/Sources/WebsitePanel.SilentInstaller/Program.cs
View file

@ -337,10 +337,13 @@ namespace WebsitePanel.SilentInstaller
string installerPath = Utils.GetDbString(row["InstallerPath"]); string installerPath = Utils.GetDbString(row["InstallerPath"]);
string installerType = Utils.GetDbString(row["InstallerType"]); string installerType = Utils.GetDbString(row["InstallerType"]);
// Get appropriate loader to download the app distributive
var loader = LoaderFactory.CreateFileLoader(fileName);
// Mimic synchronous download process for the console app
AutoResetEvent autoEvent = new AutoResetEvent(false);
try try
{ {
// download installer
var loader = new Loader(fileName);
// //
loader.OperationCompleted += new EventHandler<EventArgs>((object sender, EventArgs e) => loader.OperationCompleted += new EventHandler<EventArgs>((object sender, EventArgs e) =>
{ {
@ -374,25 +377,26 @@ namespace WebsitePanel.SilentInstaller
Log.WriteEnd("Installer finished"); Log.WriteEnd("Installer finished");
// Remove temporary directory // Remove temporary directory
FileUtils.DeleteTempDirectory(); FileUtils.DeleteTempDirectory();
// We are done
autoEvent.Set();
}); });
// TODO: Add cleanup for events.
loader.OperationFailed += new EventHandler<LoaderEventArgs<Exception>>(loader_OperationFailed); loader.OperationFailed += new EventHandler<LoaderEventArgs<Exception>>(loader_OperationFailed);
loader.ProgressChanged += new EventHandler<LoaderEventArgs<int>>(loader_ProgressChanged); loader.ProgressChanged += new EventHandler<LoaderEventArgs<int>>(loader_ProgressChanged);
loader.StatusChanged += new EventHandler<LoaderEventArgs<string>>(loader_StatusChanged); loader.StatusChanged += new EventHandler<LoaderEventArgs<string>>(loader_StatusChanged);
// //
loader.LoadAppDistributive(); loader.LoadAppDistributive();
// Wait until the download is complete
autoEvent.WaitOne();
} }
catch (Exception ex) catch (Exception ex)
{ {
Log.WriteError("Installer error", ex); Log.WriteError("Installer error", ex);
//AppContext.AppForm.ShowError(ex);
} }
finally finally
{ {
//this.componentSettingsXml = null; autoEvent.Set();
//this.componentCode = null;
} }
} }
static void loader_StatusChanged(object sender, LoaderEventArgs<string> e) static void loader_StatusChanged(object sender, LoaderEventArgs<string> e)

76
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/ExchangeServerProxy.cs
View file

@ -26,7 +26,6 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
@ -114,6 +113,8 @@ namespace WebsitePanel.EnterpriseServer {
private System.Threading.SendOrPostCallback DisableMailboxOperationCompleted; private System.Threading.SendOrPostCallback DisableMailboxOperationCompleted;
private System.Threading.SendOrPostCallback GetMailboxAdvancedSettingsOperationCompleted;
private System.Threading.SendOrPostCallback GetMailboxGeneralSettingsOperationCompleted; private System.Threading.SendOrPostCallback GetMailboxGeneralSettingsOperationCompleted;
private System.Threading.SendOrPostCallback SetMailboxGeneralSettingsOperationCompleted; private System.Threading.SendOrPostCallback SetMailboxGeneralSettingsOperationCompleted;
@ -304,6 +305,9 @@ namespace WebsitePanel.EnterpriseServer {
/// <remarks/> /// <remarks/>
public event DisableMailboxCompletedEventHandler DisableMailboxCompleted; public event DisableMailboxCompletedEventHandler DisableMailboxCompleted;
/// <remarks/>
public event GetMailboxAdvancedSettingsCompletedEventHandler GetMailboxAdvancedSettingsCompleted;
/// <remarks/> /// <remarks/>
public event GetMailboxGeneralSettingsCompletedEventHandler GetMailboxGeneralSettingsCompleted; public event GetMailboxGeneralSettingsCompletedEventHandler GetMailboxGeneralSettingsCompleted;
@ -1775,6 +1779,50 @@ namespace WebsitePanel.EnterpriseServer {
} }
} }
/// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxAdvancedSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
public ExchangeMailbox GetMailboxAdvancedSettings(int itemId, int accountId) {
object[] results = this.Invoke("GetMailboxAdvancedSettings", new object[] {
itemId,
accountId});
return ((ExchangeMailbox)(results[0]));
}
/// <remarks/>
public System.IAsyncResult BeginGetMailboxAdvancedSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
return this.BeginInvoke("GetMailboxAdvancedSettings", new object[] {
itemId,
accountId}, callback, asyncState);
}
/// <remarks/>
public ExchangeMailbox EndGetMailboxAdvancedSettings(System.IAsyncResult asyncResult) {
object[] results = this.EndInvoke(asyncResult);
return ((ExchangeMailbox)(results[0]));
}
/// <remarks/>
public void GetMailboxAdvancedSettingsAsync(int itemId, int accountId) {
this.GetMailboxAdvancedSettingsAsync(itemId, accountId, null);
}
/// <remarks/>
public void GetMailboxAdvancedSettingsAsync(int itemId, int accountId, object userState) {
if ((this.GetMailboxAdvancedSettingsOperationCompleted == null)) {
this.GetMailboxAdvancedSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetMailboxAdvancedSettingsOperationCompleted);
}
this.InvokeAsync("GetMailboxAdvancedSettings", new object[] {
itemId,
accountId}, this.GetMailboxAdvancedSettingsOperationCompleted, userState);
}
private void OnGetMailboxAdvancedSettingsOperationCompleted(object arg) {
if ((this.GetMailboxAdvancedSettingsCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
this.GetMailboxAdvancedSettingsCompleted(this, new GetMailboxAdvancedSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
/// <remarks/> /// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxGeneralSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxGeneralSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
public ExchangeMailbox GetMailboxGeneralSettings(int itemId, int accountId) { public ExchangeMailbox GetMailboxGeneralSettings(int itemId, int accountId) {
@ -5196,6 +5244,32 @@ namespace WebsitePanel.EnterpriseServer {
} }
} }
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
public delegate void GetMailboxAdvancedSettingsCompletedEventHandler(object sender, GetMailboxAdvancedSettingsCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
public partial class GetMailboxAdvancedSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
private object[] results;
internal GetMailboxAdvancedSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
base(exception, cancelled, userState) {
this.results = results;
}
/// <remarks/>
public ExchangeMailbox Result {
get {
this.RaiseExceptionIfNecessary();
return ((ExchangeMailbox)(this.results[0]));
}
}
}
/// <remarks/> /// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")] [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
public delegate void GetMailboxGeneralSettingsCompletedEventHandler(object sender, GetMailboxGeneralSettingsCompletedEventArgs e); public delegate void GetMailboxGeneralSettingsCompletedEventHandler(object sender, GetMailboxGeneralSettingsCompletedEventArgs e);

2
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Common/UsernameAssertion.cs
View file

@ -232,7 +232,7 @@ namespace WebsitePanel.EnterpriseServer
); );
if (user == null) if (user == null)
throw new Exception("Authentication token is invalid or borken"); throw new Exception("Authentication token is invalid or broken");
SecurityContext.SetThreadPrincipal(user); SecurityContext.SetThreadPrincipal(user);
} }

2
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/VirtualizationForPrivateCloud/VirtualizationServerControllerForPrivateCloud.cs
View file

@ -2700,7 +2700,7 @@ namespace WebsitePanel.EnterpriseServer
public static NetworkAdapterDetails GetExternalNetworkAdapterDetails(int itemId) public static NetworkAdapterDetails GetExternalNetworkAdapterDetails(int itemId)
{ {
// load service item // load service item
VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId); VMInfo vm = (VMInfo)PackageController.GetPackageItem(itemId);
if (vm == null) if (vm == null)
return null; return null;

7
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esExchangeServer.asmx.cs
View file

@ -236,12 +236,19 @@ namespace WebsitePanel.EnterpriseServer
} }
[WebMethod]
public ExchangeMailbox GetMailboxAdvancedSettings(int itemId, int accountId)
{
return ExchangeServerController.GetMailboxAdvancedSettings(itemId, accountId);
}
[WebMethod] [WebMethod]
public ExchangeMailbox GetMailboxGeneralSettings(int itemId, int accountId) public ExchangeMailbox GetMailboxGeneralSettings(int itemId, int accountId)
{ {
return ExchangeServerController.GetMailboxGeneralSettings(itemId, accountId); return ExchangeServerController.GetMailboxGeneralSettings(itemId, accountId);
} }
[WebMethod] [WebMethod]
public int SetMailboxGeneralSettings(int itemId, int accountId, bool hideAddressBook, bool disabled) public int SetMailboxGeneralSettings(int itemId, int accountId, bool hideAddressBook, bool disabled)
{ {

37
WebsitePanel/Sources/WebsitePanel.Providers.FTP.FileZilla/FileZilla.cs
View file

@ -154,25 +154,30 @@ namespace WebsitePanel.Providers.FTP
Log.WriteInfo("Find users nodes"); Log.WriteInfo("Find users nodes");
// find users node // find users node
XmlNode nodeUsers = doc.SelectSingleNode("/FileZillaServer/Users"); XmlNode fzServerNode = doc.SelectSingleNode("/FileZillaServer");
XmlNode fzAccountsNode = fzServerNode.SelectSingleNode("/Users");
XmlElement nodeUser = doc.CreateElement("User"); if (fzAccountsNode == null)
if (nodeUsers != null) nodeUsers.AppendChild(nodeUser); {
fzAccountsNode = doc.CreateElement("Users");
fzServerNode.AppendChild(fzAccountsNode);
}
XmlElement fzAccountNode = doc.CreateElement("User");
fzAccountsNode.AppendChild(fzAccountNode);
// set properties // set properties
nodeUser.SetAttribute("Name", account.Name); fzAccountNode.SetAttribute("Name", account.Name);
SetOption(nodeUser, "Pass", MD5(account.Password)); SetOption(fzAccountNode, "Pass", MD5(account.Password));
SetOption(nodeUser, "Group", ""); SetOption(fzAccountNode, "Group", "");
SetOption(nodeUser, "Bypass server userlimit", "0"); SetOption(fzAccountNode, "Bypass server userlimit", "0");
SetOption(nodeUser, "User Limit", "0"); SetOption(fzAccountNode, "User Limit", "0");
SetOption(nodeUser, "IP Limit", "0"); SetOption(fzAccountNode, "IP Limit", "0");
SetOption(nodeUser, "Enabled", BoolToString(account.Enabled)); SetOption(fzAccountNode, "Enabled", BoolToString(account.Enabled));
SetOption(nodeUser, "Comments", ""); SetOption(fzAccountNode, "Comments", "");
SetOption(nodeUser, "ForceSsl", "0"); SetOption(fzAccountNode, "ForceSsl", "0");
// IP filter // IP filter
XmlElement nodeIPFilter = doc.CreateElement("IpFilter"); XmlElement nodeIPFilter = doc.CreateElement("IpFilter");
nodeUser.AppendChild(nodeIPFilter); fzAccountNode.AppendChild(nodeIPFilter);
XmlElement nodeDisallowed = doc.CreateElement("Disallowed"); XmlElement nodeDisallowed = doc.CreateElement("Disallowed");
nodeIPFilter.AppendChild(nodeDisallowed); nodeIPFilter.AppendChild(nodeDisallowed);
@ -182,7 +187,7 @@ namespace WebsitePanel.Providers.FTP
// folder // folder
XmlElement nodePermissions = doc.CreateElement("Permissions"); XmlElement nodePermissions = doc.CreateElement("Permissions");
nodeUser.AppendChild(nodePermissions); fzAccountNode.AppendChild(nodePermissions);
XmlElement nodePermission = doc.CreateElement("Permission"); XmlElement nodePermission = doc.CreateElement("Permission");
nodePermissions.AppendChild(nodePermission); nodePermissions.AppendChild(nodePermission);
@ -201,7 +206,7 @@ namespace WebsitePanel.Providers.FTP
// speed limits // speed limits
XmlElement nodeSpeedLimits = doc.CreateElement("SpeedLimits"); XmlElement nodeSpeedLimits = doc.CreateElement("SpeedLimits");
nodeUser.AppendChild(nodeSpeedLimits); fzAccountNode.AppendChild(nodeSpeedLimits);
nodeSpeedLimits.SetAttribute("DlType", "0"); nodeSpeedLimits.SetAttribute("DlType", "0");
nodeSpeedLimits.SetAttribute("DlLimit", "10"); nodeSpeedLimits.SetAttribute("DlLimit", "10");
nodeSpeedLimits.SetAttribute("ServerDlLimitBypass", "0"); nodeSpeedLimits.SetAttribute("ServerDlLimitBypass", "0");

130
WebsitePanel/Sources/WebsitePanel.Server.Utils/FileUtils.cs
View file

@ -38,14 +38,98 @@ using System.Reflection;
using Ionic.Zip; using Ionic.Zip;
using WebsitePanel.Providers.OS; using WebsitePanel.Providers.OS;
namespace WebsitePanel.Providers.Utils namespace WebsitePanel.Providers.Utils
{ {
/// <summary>
/// Defines a contract that a system command provider needs to implement.
/// </summary>
public interface ICommandLineProvider
{
/// <summary>
/// Executes the file specifed as if you were executing it via command-line interface.
/// </summary>
/// <param name="filePath">Path to the executable file (eq. .exe, .bat, .cmd and etc).</param>
/// <param name="args">Arguments to pass to the executable file</param>
/// <param name="outputFile">Path to the output file if you want the output to be written somewhere.</param>
/// <returns>Output of the command being executed.</returns>
string Execute(string filePath, string args, string outputFile);
}
/// <summary>
/// Provides a default implementation of running system commands.
/// </summary>
public sealed class DefaultCommandLineProvider : ICommandLineProvider
{
/// <summary>
/// Creates a new process and executes the file specifed as if you were executing it via command-line interface.
/// </summary>
/// <param name="filePath">Path to the executable file (eq. .exe, .bat, .cmd and etc).</param>
/// <param name="args">Arguments to pass to the executable file</param>
/// <param name="outputFile">Path to the output file if you want the output to be written somewhere.</param>
/// <returns>Output of the command being executed.</returns>
public string Execute(string filePath, string args, string outputFile)
{
// launch system process
ProcessStartInfo startInfo = new ProcessStartInfo(filePath, args);
startInfo.WindowStyle = ProcessWindowStyle.Hidden;
startInfo.RedirectStandardOutput = true;
startInfo.UseShellExecute = false;
startInfo.CreateNoWindow = true;
// get working directory from executable path
startInfo.WorkingDirectory = Path.GetDirectoryName(filePath);
Process proc = Process.Start(startInfo);
// analyze results
StreamReader reader = proc.StandardOutput;
string results = "";
if (!String.IsNullOrEmpty(outputFile))
{
// stream to writer
StreamWriter writer = new StreamWriter(outputFile);
int BUFFER_LENGTH = 2048;
int readBytes = 0;
char[] buffer = new char[BUFFER_LENGTH];
while ((readBytes = reader.Read(buffer, 0, BUFFER_LENGTH)) > 0)
{
writer.Write(buffer, 0, readBytes);
}
writer.Close();
}
else
{
// return as string
results = reader.ReadToEnd();
}
reader.Close();
return results;
}
}
/// <summary> /// <summary>
/// Summary description for FileUtils. /// Summary description for FileUtils.
/// </summary> /// </summary>
public class FileUtils public class FileUtils
{ {
private static ICommandLineProvider CliProvider;
static FileUtils()
{
SetDefaultCliProvider(new DefaultCommandLineProvider());
}
/// <summary>
/// Initializes command-line provider for the utility class. Yet this is not a perfect way to inverse control over CLI processing
/// but it does its job for the testing purposes.
/// </summary>
/// <param name="provider">An instance of a command-line provider to initialize the utility with.</param>
public static void SetDefaultCliProvider(ICommandLineProvider provider)
{
Debug.Assert(provider != null, "Command line provider is null");
CliProvider = provider;
}
public static string EvaluateSystemVariables(string str) public static string EvaluateSystemVariables(string str)
{ {
if (String.IsNullOrEmpty(str)) if (String.IsNullOrEmpty(str))
@ -616,45 +700,17 @@ namespace WebsitePanel.Providers.Utils
return ExecuteSystemCommand(cmd, args, null); return ExecuteSystemCommand(cmd, args, null);
} }
/// <summary>
/// Executes the file specifed as if you were executing it via command-line interface.
/// </summary>
/// <param name="filePath">Path to the executable file (eq. .exe, .bat, .cmd and etc).</param>
/// <param name="args">Arguments to pass to the executable file</param>
/// <param name="outputFile">Path to the output file if you want the output to be written somewhere.</param>
/// <returns>Output of the command being executed.</returns>
public static string ExecuteSystemCommand(string cmd, string args, string outputFile) public static string ExecuteSystemCommand(string cmd, string args, string outputFile)
{ {
// launch system process // launch system process
ProcessStartInfo startInfo = new ProcessStartInfo(cmd, args); return CliProvider.Execute(cmd, args, outputFile);
startInfo.WindowStyle = ProcessWindowStyle.Hidden;
startInfo.RedirectStandardOutput = true;
startInfo.StandardOutputEncoding = Encoding.UTF8;
startInfo.UseShellExecute = false;
startInfo.CreateNoWindow = true;
// get working directory from executable path
startInfo.WorkingDirectory = Path.GetDirectoryName(cmd);
Process proc = Process.Start(startInfo);
// analyze results
StreamReader reader = proc.StandardOutput;
string results = "";
if (!String.IsNullOrEmpty(outputFile))
{
// stream to writer
StreamWriter writer = new StreamWriter(outputFile);
int BUFFER_LENGTH = 2048;
int readBytes = 0;
char[] buffer = new char[BUFFER_LENGTH];
while ((readBytes = reader.Read(buffer, 0, BUFFER_LENGTH)) > 0)
{
writer.Write(buffer, 0, readBytes);
}
writer.Close();
}
else
{
// return as string
results = reader.ReadToEnd();
}
reader.Close();
return results;
} }
public static void ExecuteCmdCommand(string command) public static void ExecuteCmdCommand(string command)

18
WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
View file

@ -5164,4 +5164,22 @@
<data name="Quota.Lync.EnablePlansEditing" xml:space="preserve"> <data name="Quota.Lync.EnablePlansEditing" xml:space="preserve">
<value>Enable Lync User Plans Editing</value> <value>Enable Lync User Plans Editing</value>
</data> </data>
<data name="Error.EXCHANGE_APPLYPLANTEMPLATE" xml:space="preserve">
<value>Failed to apply plans template</value>
</data>
<data name="Success.EXCHANGE_APPLYPLANTEMPLATE" xml:space="preserve">
<value>Succesfully applied plans template</value>
</data>
<data name="Error.EXCHANGE_MATCHPLANS" xml:space="preserve">
<value>Failed to match plans</value>
</data>
<data name="Success.EXCHANGE_MATCHPLANS" xml:space="preserve">
<value>Succesfully plans matched and applied</value>
</data>
<data name="Error.LYNC_APPLYPLANTEMPLATE" xml:space="preserve">
<value>Failed to apply plans template</value>
</data>
<data name="Success.LYNC_APPLYPLANTEMPLATE" xml:space="preserve">
<value>Succesfully applied plans template</value>
</data>
</root> </root>

6
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SettingsExchangeMailboxPlansPolicy.ascx.resx
View file

@ -213,4 +213,10 @@
<data name="valRequireMailboxPlan.Text" xml:space="preserve"> <data name="valRequireMailboxPlan.Text" xml:space="preserve">
<value>*</value> <value>*</value>
</data> </data>
<data name="btnAddMailboxPlanToOrganizations.Text" xml:space="preserve">
<value>Add Mailbox Plans Template to All Tenants</value>
</data>
<data name="btnMatchMailboxPlanToUser.Text" xml:space="preserve">
<value>Match Mailbox Plan to User</value>
</data>
</root> </root>

60
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/VirtualMachinesHelper.cs
View file

@ -29,9 +29,54 @@
using WebsitePanel.EnterpriseServer; using WebsitePanel.EnterpriseServer;
using WebsitePanel.Providers.Virtualization; using WebsitePanel.Providers.Virtualization;
using System.Web; using System.Web;
using System;
namespace WebsitePanel.Portal namespace WebsitePanel.Portal
{ {
// TODO: Move this extension to a separate file later.
public static class VirtualMachinesExtensions
{
#region Privates with specific purposes (eq. caching, usability, performance and etc)
/// <summary>
/// This method supports the Portal internal infrastructure and is not intended to be used directly from your code. Gets a cached copy of virtual machine object of the specified type or retrieves it for the first time and then caches it.
/// </summary>
/// <typeparam name="T">Type of virtual machine to be retrieved (possible types are VirtualMachine|VMInfo)</typeparam>
/// <param name="cacheIdentityKey">Virtual machine item id</param>
/// <param name="getVmFunc">Function to retrieve the virtual machine data from Enterprise Server</param>
/// <returns>An instance of the specified virtual machine</returns>
internal static T GetCachedVirtualMachine<T>(object cacheIdentityKey, Func<T> getVmFunc)
{
// TODO: Make this method private when all dependents will be consolidated in the extension.
string cacheKey = "CachedVirtualMachine_" + cacheIdentityKey;
if (HttpContext.Current.Items[cacheKey] != null)
return (T)HttpContext.Current.Items[cacheKey];
// load virtual machine
T virtualMachine = getVmFunc();
// place to cache
if (virtualMachine != null)
HttpContext.Current.Items[cacheKey] = virtualMachine;
return virtualMachine;
}
#endregion
#region Extension methods
/// <summary>
/// Gets a cached copy of virtual machine object of the specified type or retrieves it for the first time and then caches it.
/// </summary>
/// <param name="client"></param>
/// <param name="itemId">Virtual machine id</param>
/// <returns>An instance of the virtual machine speficied</returns>
public static VMInfo GetCachedVirtualMachine(this esVirtualizationServerForPrivateCloud client, int itemId)
{
return GetCachedVirtualMachine<VMInfo>(
itemId, () => ES.Services.VPSPC.GetVirtualMachineItem(itemId));
}
#endregion
}
public class VirtualMachinesHelper public class VirtualMachinesHelper
{ {
public static bool IsVirtualMachineManagementAllowed(int packageId) public static bool IsVirtualMachineManagementAllowed(int packageId)
@ -57,20 +102,11 @@ namespace WebsitePanel.Portal
return manageAllowed; return manageAllowed;
} }
// TODO: Move this method to the corresponding extension later.
public static VirtualMachine GetCachedVirtualMachine(int itemId) public static VirtualMachine GetCachedVirtualMachine(int itemId)
{ {
string key = "CachedVirtualMachine" + itemId; return VirtualMachinesExtensions.GetCachedVirtualMachine<VirtualMachine>(
if (HttpContext.Current.Items[key] != null) itemId, () => ES.Services.VPS.GetVirtualMachineItem(itemId));
return (VirtualMachine)HttpContext.Current.Items[key];
// load virtual machine
VirtualMachine vm = ES.Services.VPS.GetVirtualMachineItem(itemId);
// place to cache
if (vm != null)
HttpContext.Current.Items[key] = vm;
return vm;
} }
#region Virtual Machines #region Virtual Machines

15
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx
View file

@ -2,8 +2,11 @@
<%@ Register Src="ExchangeServer/UserControls/SizeBox.ascx" TagName="SizeBox" TagPrefix="wsp" %> <%@ Register Src="ExchangeServer/UserControls/SizeBox.ascx" TagName="SizeBox" TagPrefix="wsp" %>
<%@ Register Src="ExchangeServer/UserControls/DaysBox.ascx" TagName="DaysBox" TagPrefix="wsp" %> <%@ Register Src="ExchangeServer/UserControls/DaysBox.ascx" TagName="DaysBox" TagPrefix="wsp" %>
<%@ Register Src="UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %> <%@ Register Src="UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
<%@ Register Src="UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
<%@ Register Src="UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
<wsp:SimpleMessageBox id="messageBox" runat="server" />
<asp:GridView id="gvMailboxPlans" runat="server" EnableViewState="true" AutoGenerateColumns="false" <asp:GridView id="gvMailboxPlans" runat="server" EnableViewState="true" AutoGenerateColumns="false"
Width="100%" EmptyDataText="gvMailboxPlans" CssSelectorClass="NormalGridView" OnRowCommand="gvMailboxPlan_RowCommand" > Width="100%" EmptyDataText="gvMailboxPlans" CssSelectorClass="NormalGridView" OnRowCommand="gvMailboxPlan_RowCommand" >
<Columns> <Columns>
@ -184,5 +187,15 @@
Text="Add New Mailboxplan" CssClass="Button1" OnClick="btnAddMailboxPlan_Click" /> Text="Add New Mailboxplan" CssClass="Button1" OnClick="btnAddMailboxPlan_Click" />
</div> </div>
<div class="FormButtonsBarClean">
<asp:Button ID="btnAddMailboxPlanToOrganizations" runat="server" meta:resourcekey="btnAddMailboxPlanToOrganizations"
Text="Add Mailbox Plans Template to All Organizations" CssClass="Button1" OnClick="btnAddMailboxPlanToOrganizations_Click" OnClientClick="if (confirm('Plans with an existing name will not be added. \nAre you sure you want to add the plans template to all tenants ?')) ShowProgressDialog('Adding mailbox plans, this might take a while ...'); else return false;"/>
</div>
<div class="FormButtonsBarClean">
<asp:Button ID="btnMatchMailboxPlanToUser" runat="server" meta:resourcekey="btnMatchMailboxPlanToUser"
Text="Match Plan to User" CssClass="Button1"
OnClientClick="if (confirm('Mail enabled users with no mailbox plan assigned will get a matching mailbox plan applied.\nMatching takes place on mailbox size and the MAPI properties.\n\nAre you sure you want to continue with this ?')) ShowProgressDialog('Applying mailbox plans, this might take a while ...'); else return false;"
onclick="btnMatchMailboxPlanToUser_Click" />
</div>

183
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx.cs
View file

@ -238,5 +238,188 @@ namespace WebsitePanel.Portal
settings[UserSettings.DEFAULT_MAILBOXPLANS] = writer.ToString(); settings[UserSettings.DEFAULT_MAILBOXPLANS] = writer.ToString();
} }
protected void btnAddMailboxPlanToOrganizations_Click(object sender, EventArgs e)
{
AddMailboxPlanToOrganizations("ServerAdmin");
}
private void AddMailboxPlanToOrganizations(string serverAdmin)
{
UserInfo ServerAdminInfo = ES.Services.Users.GetUserByUsername(serverAdmin);
if (ServerAdminInfo == null) return;
UserInfo[] UsersInfo = ES.Services.Users.GetUsers(ServerAdminInfo.UserId, true);
try
{
foreach (UserInfo ui in UsersInfo)
{
PackageInfo[] Packages = ES.Services.Packages.GetPackages(ui.UserId);
if ((Packages != null) & (Packages.GetLength(0) > 0))
{
foreach (PackageInfo Package in Packages)
{
Providers.HostedSolution.Organization[] orgs = null;
orgs = ES.Services.ExchangeServer.GetExchangeOrganizations(Package.PackageId, false);
if ((orgs != null) & (orgs.GetLength(0) > 0))
{
foreach (Organization org in orgs)
{
if (!string.IsNullOrEmpty(org.GlobalAddressList))
{
ExchangeMailboxPlan[] plans = ES.Services.ExchangeServer.GetExchangeMailboxPlans(org.Id);
foreach (ExchangeMailboxPlan p in list)
{
if (!PlanExists(p, plans)) ES.Services.ExchangeServer.AddExchangeMailboxPlan(org.Id, p);
}
}
}
}
}
}
}
messageBox.ShowSuccessMessage("EXCHANGE_APPLYPLANTEMPLATE");
}
catch (Exception ex)
{
messageBox.ShowErrorMessage("EXCHANGE_APPLYPLANTEMPLATE", ex);
}
}
private bool PlanExists(ExchangeMailboxPlan plan, ExchangeMailboxPlan[] plans)
{
bool result = false;
foreach (ExchangeMailboxPlan p in plans)
{
if (p.MailboxPlan.ToLower() == plan.MailboxPlan.ToLower())
{
result = true;
break;
}
}
return result;
}
protected void btnMatchMailboxPlanToUser_Click(object sender, EventArgs e)
{
MatchMailboxPlanToUser("serverAdmin");
}
private void MatchMailboxPlanToUser(string serverAdmin)
{
UserInfo ServerAdminInfo = ES.Services.Users.GetUserByUsername(serverAdmin);
if (ServerAdminInfo == null) return;
UserInfo[] UsersInfo = ES.Services.Users.GetUsers(ServerAdminInfo.UserId, true);
try
{
foreach (UserInfo ui in UsersInfo)
{
PackageInfo[] Packages = ES.Services.Packages.GetPackages(ui.UserId);
if ((Packages != null) & (Packages.GetLength(0) > 0))
{
foreach (PackageInfo Package in Packages)
{
Providers.HostedSolution.Organization[] orgs = null;
orgs = ES.Services.ExchangeServer.GetExchangeOrganizations(Package.PackageId, false);
if ((orgs != null) & (orgs.GetLength(0) > 0))
{
foreach (Organization org in orgs)
{
if (!string.IsNullOrEmpty(org.GlobalAddressList))
{
ExchangeMailboxPlan[] plans = ES.Services.ExchangeServer.GetExchangeMailboxPlans(org.Id);
ExchangeAccount[] mailboxes = ES.Services.ExchangeServer.GetAccounts(org.Id, ExchangeAccountType.Mailbox);
ExchangeAccount[] rooms = ES.Services.ExchangeServer.GetAccounts(org.Id, ExchangeAccountType.Room);
ExchangeAccount[] equipment = ES.Services.ExchangeServer.GetAccounts(org.Id, ExchangeAccountType.Equipment);
MatchExchangeAccountToPlan(org.Id, mailboxes, plans);
MatchExchangeAccountToPlan(org.Id, rooms, plans);
MatchExchangeAccountToPlan(org.Id, equipment, plans);
}
}
}
}
}
}
messageBox.ShowSuccessMessage("EXCHANGE_MATCHPLANS");
}
catch (Exception ex)
{
messageBox.ShowErrorMessage("EXCHANGE_MATCHPLANS", ex);
}
}
private void MatchExchangeAccountToPlan(int itemId, ExchangeAccount[] mailboxes, ExchangeMailboxPlan[] plans)
{
foreach (ExchangeAccount a in mailboxes)
{
if (string.IsNullOrEmpty(a.MailboxPlan))
{
ExchangeMailbox mailbox = ES.Services.ExchangeServer.GetMailboxAdvancedSettings(itemId, a.AccountId);
if (mailbox != null)
{
List<ExchangeMailboxPlan> pl = new List<ExchangeMailboxPlan>();
//sort a list of similar MAPI
foreach (ExchangeMailboxPlan p in plans)
{
if (p.EnableMAPI == mailbox.EnableMAPI)
pl.Add(p);
}
//remove plans smaller than mailbox size
ExchangeMailboxPlan p3 = null;
foreach (ExchangeMailboxPlan p2 in pl)
{
if (p2.MailboxSizeMB >= (mailbox.ProhibitSendReceiveKB / 1024))
{
if (p3 == null)
p3 = p2;
else
if ((p2.MailboxSizeMB) <= p3.MailboxSizeMB)
p3 = p2;
}
}
// no matching plan, just match on size
if (p3 == null)
{
foreach (ExchangeMailboxPlan p in plans)
{
if (p.MailboxSizeMB >= (mailbox.ProhibitSendReceiveKB / 1024))
{
if (p3 == null)
p3 = p;
else
if ((p.MailboxSizeMB) <= p3.MailboxSizeMB)
p3 = p;
}
}
}
if (p3 != null)
ES.Services.ExchangeServer.SetExchangeMailboxPlan(itemId, a.AccountId, p3.MailboxPlanId);
}
}
}
}
} }
} }

66
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx.designer.cs generated
View file

@ -1,32 +1,4 @@
// Copyright (c) 2012, Outercurve Foundation. //------------------------------------------------------------------------------
// All rights reserved.
//
// 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 Outercurve Foundation 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR 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.
//------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// //
@ -40,6 +12,24 @@ namespace WebsitePanel.Portal {
public partial class SettingsExchangeMailboxPlansPolicy { public partial class SettingsExchangeMailboxPlansPolicy {
/// <summary>
/// asyncTasks control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
/// <summary>
/// messageBox control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
/// <summary> /// <summary>
/// gvMailboxPlans control. /// gvMailboxPlans control.
/// </summary> /// </summary>
@ -381,5 +371,23 @@ namespace WebsitePanel.Portal {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Button btnAddMailboxPlan; protected global::System.Web.UI.WebControls.Button btnAddMailboxPlan;
/// <summary>
/// btnAddMailboxPlanToOrganizations 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.Button btnAddMailboxPlanToOrganizations;
/// <summary>
/// btnMatchMailboxPlanToUser 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.Button btnMatchMailboxPlanToUser;
} }
} }

9
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsLyncUserPlansPolicy.ascx
View file

@ -1,7 +1,10 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="SettingsLyncUserPlansPolicy.ascx.cs" Inherits="WebsitePanel.Portal.SettingsLyncUserPlansPolicy" %> <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="SettingsLyncUserPlansPolicy.ascx.cs" Inherits="WebsitePanel.Portal.SettingsLyncUserPlansPolicy" %>
<%@ Register Src="UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %> <%@ Register Src="UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
<%@ Register Src="UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
<%@ Register Src="UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
<wsp:SimpleMessageBox id="messageBox" runat="server" />
<asp:GridView id="gvPlans" runat="server" EnableViewState="true" AutoGenerateColumns="false" <asp:GridView id="gvPlans" runat="server" EnableViewState="true" AutoGenerateColumns="false"
Width="100%" EmptyDataText="gvPlans" CssSelectorClass="NormalGridView" OnRowCommand="gvPlan_RowCommand" > Width="100%" EmptyDataText="gvPlans" CssSelectorClass="NormalGridView" OnRowCommand="gvPlan_RowCommand" >
<Columns> <Columns>
@ -133,5 +136,9 @@
Text="Add New plan" CssClass="Button1" OnClick="btnAddPlan_Click" /> Text="Add New plan" CssClass="Button1" OnClick="btnAddPlan_Click" />
</div> </div>
<div class="FormButtonsBarClean">
<asp:Button ID="btnAddPlanToOrganizations" runat="server" meta:resourcekey="btnAddPlanToOrganizations"
Text="Add Plans Template to All Organizations" CssClass="Button1" OnClick="btnAddPlanToOrganizations_Click" OnClientClick="if (confirm('Plans with an existing name will not be added. \nAre you sure you want to add the plans template to all tenants ?')) ShowProgressDialog('Adding plans, this might take a while ...'); else return false;"/>
</div>

69
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsLyncUserPlansPolicy.ascx.cs
View file

@ -256,6 +256,75 @@ namespace WebsitePanel.Portal
settings[UserSettings.DEFAULT_LYNCUSERPLANS] = writer.ToString(); settings[UserSettings.DEFAULT_LYNCUSERPLANS] = writer.ToString();
} }
protected void btnAddPlanToOrganizations_Click(object sender, EventArgs e)
{
AddPlanToOrganizations("ServerAdmin");
}
private void AddPlanToOrganizations(string serverAdmin)
{
UserInfo ServerAdminInfo = ES.Services.Users.GetUserByUsername(serverAdmin);
if (ServerAdminInfo == null) return;
UserInfo[] UsersInfo = ES.Services.Users.GetUsers(ServerAdminInfo.UserId, true);
try
{
foreach (UserInfo ui in UsersInfo)
{
PackageInfo[] Packages = ES.Services.Packages.GetPackages(ui.UserId);
if ((Packages != null) & (Packages.GetLength(0) > 0))
{
foreach (PackageInfo Package in Packages)
{
Providers.HostedSolution.Organization[] orgs = null;
orgs = ES.Services.ExchangeServer.GetExchangeOrganizations(Package.PackageId, false);
if ((orgs != null) & (orgs.GetLength(0) > 0))
{
foreach (Organization org in orgs)
{
if (!string.IsNullOrEmpty(org.LyncTenantId))
{
LyncUserPlan[] plans = ES.Services.Lync.GetLyncUserPlans(org.Id);
foreach (LyncUserPlan p in list)
{
if (!PlanExists(p, plans)) ES.Services.Lync.AddLyncUserPlan(org.Id, p);
}
}
}
}
}
}
}
messageBox.ShowSuccessMessage("LYNC_APPLYPLANTEMPLATE");
}
catch (Exception ex)
{
messageBox.ShowErrorMessage("LYNC_APPLYPLANTEMPLATE", ex);
}
}
private bool PlanExists(LyncUserPlan plan, LyncUserPlan[] plans)
{
bool result = false;
foreach (LyncUserPlan p in plans)
{
if (p.LyncUserPlanName.ToLower() == plan.LyncUserPlanName.ToLower())
{
result = true;
break;
}
}
return result;
}
} }

58
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsLyncUserPlansPolicy.ascx.designer.cs generated
View file

@ -1,33 +1,4 @@
// Copyright (c) 2012, Outercurve Foundation. //------------------------------------------------------------------------------
// All rights reserved.
//
// 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 Outercurve Foundation 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR 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.
//------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// //
@ -41,6 +12,24 @@ namespace WebsitePanel.Portal {
public partial class SettingsLyncUserPlansPolicy { public partial class SettingsLyncUserPlansPolicy {
/// <summary>
/// asyncTasks control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
/// <summary>
/// messageBox control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
/// <summary> /// <summary>
/// gvPlans control. /// gvPlans control.
/// </summary> /// </summary>
@ -229,5 +218,14 @@ namespace WebsitePanel.Portal {
/// To modify move field declaration from designer file to code-behind file. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Button btnAddPlan; protected global::System.Web.UI.WebControls.Button btnAddPlan;
/// <summary>
/// btnAddPlanToOrganizations 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.Button btnAddPlanToOrganizations;
} }
} }

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceDetails.ascx.cs
View file

@ -88,7 +88,7 @@ namespace WebsitePanel.Portal
lnkEditSpaceDetails.Visible = (PanelSecurity.PackageId > 1 && !ownSpace); lnkEditSpaceDetails.Visible = (PanelSecurity.PackageId > 1 && !ownSpace);
lnkDelete.NavigateUrl = EditUrl(PortalUtils.SPACE_ID_PARAM, PanelSecurity.PackageId.ToString(), "delete"); lnkDelete.NavigateUrl = EditUrl(PortalUtils.SPACE_ID_PARAM, PanelSecurity.PackageId.ToString(), "delete");
if (PanelSecurity.LoggedUser.Role != UserRole.Reseller) if (!((PanelSecurity.LoggedUser.Role == UserRole.Reseller) | (PanelSecurity.LoggedUser.Role == UserRole.Administrator)))
lnkDelete.Visible = false; lnkDelete.Visible = false;
else else
lnkDelete.Visible = ((PanelSecurity.SelectedUserId != PanelSecurity.EffectiveUserId) && (PanelSecurity.PackageId > 1)); lnkDelete.Visible = ((PanelSecurity.SelectedUserId != PanelSecurity.EffectiveUserId) && (PanelSecurity.PackageId > 1));

7
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPSForPC/RemoteDesktop/Connect.aspx.cs
View file

@ -40,13 +40,14 @@ namespace WebsitePanel.Portal.VPSForPC.RemoteDesktop
resolution.Text = Request["Resolution"]; resolution.Text = Request["Resolution"];
// load server info // load server info
VirtualMachine vm = VirtualMachinesHelper.GetCachedVirtualMachine(PanelRequest.ItemID); VMInfo vm = ES.Services.VPSPC.GetCachedVirtualMachine(PanelRequest.ItemID);
litServerName.Text = vm.Name + " - "; litServerName.Text = vm.Name + " - ";
username.Text = "Administrator"; username.Text = "Administrator";
password.Text = vm.AdministratorPassword; // TODO: Review VMInfo class fields and underlying data for correctness
password.Text = vm.AdminPassword;
// load external network parameters // load external network parameters
NetworkAdapterDetails nic = ES.Services.VPS.GetExternalNetworkAdapterDetails(PanelRequest.ItemID); NetworkAdapterDetails nic = ES.Services.VPSPC.GetExternalNetworkAdapterDetails(PanelRequest.ItemID);
if (nic.IPAddresses.Length > 0) if (nic.IPAddresses.Length > 0)
{ {
NetworkAdapterIPAddress ip = nic.IPAddresses[0]; NetworkAdapterIPAddress ip = nic.IPAddresses[0];

12
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs
View file

@ -66,7 +66,6 @@ namespace WebsitePanel.Portal
new Tab { Id = "mime", ResourceKey = "Tab.MIMETypes", Quota = Quotas.WEB_MIME, ViewId = "tabMimes" }, new Tab { Id = "mime", ResourceKey = "Tab.MIMETypes", Quota = Quotas.WEB_MIME, ViewId = "tabMimes" },
new Tab { Id = "coldfusion", ResourceKey = "Tab.ColdFusion", Quota = Quotas.WEB_COLDFUSION, ViewId = "tabCF" }, new Tab { Id = "coldfusion", ResourceKey = "Tab.ColdFusion", Quota = Quotas.WEB_COLDFUSION, ViewId = "tabCF" },
new Tab { Id = "webman", ResourceKey = "Tab.WebManagement", Quota = Quotas.WEB_REMOTEMANAGEMENT, ViewId = "tabWebManagement" }, new Tab { Id = "webman", ResourceKey = "Tab.WebManagement", Quota = Quotas.WEB_REMOTEMANAGEMENT, ViewId = "tabWebManagement" },
new Tab { Id = "SSL", ResourceKey = "Tab.SSL", Quota = Quotas.WEB_SSL, ViewId = "SSL" },
}; };
private int PackageId private int PackageId
@ -167,6 +166,7 @@ namespace WebsitePanel.Portal
if (!String.IsNullOrEmpty(site.SiteIPAddress)) if (!String.IsNullOrEmpty(site.SiteIPAddress))
litIPAddress.Text = String.Format("({0})", site.SiteIPAddress); litIPAddress.Text = String.Format("({0})", site.SiteIPAddress);
litFrontPageUnavailable.Visible = false; litFrontPageUnavailable.Visible = false;
tblSharePoint.Visible = site.SharePointInstalled; tblSharePoint.Visible = site.SharePointInstalled;
tblFrontPage.Visible = !site.SharePointInstalled; tblFrontPage.Visible = !site.SharePointInstalled;
@ -234,7 +234,17 @@ namespace WebsitePanel.Portal
webSitesMimeTypesControl.BindWebItem(site); webSitesMimeTypesControl.BindWebItem(site);
webSitesCustomHeadersControl.BindWebItem(site); webSitesCustomHeadersControl.BindWebItem(site);
webSitesCustomErrorsControl.BindWebItem(site); webSitesCustomErrorsControl.BindWebItem(site);
if (site.SiteIPAddress != null)
{
TabsList.Add(new Tab { Id = "SSL", ResourceKey = "Tab.SSL", Quota = Quotas.WEB_SSL, ViewId = "SSL" });
TabsList.ForEach((x) =>
{
x.Name = GetLocalizedString(x.ResourceKey);
x.ResourceGroup = x.ResourceGroup ?? ResourceGroups.Web;
});
WebsitesSSLControl.BindWebItem(site); WebsitesSSLControl.BindWebItem(site);
}
BindVirtualDirectories(); BindVirtualDirectories();

5
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesHomeFolderControl.ascx.cs
View file

@ -108,6 +108,11 @@ namespace WebsitePanel.Portal
chkDedicatedPool.Visible = PackagesHelper.CheckGroupQuotaEnabled(packageId, ResourceGroups.Web, Quotas.WEB_APPPOOLS); chkDedicatedPool.Visible = PackagesHelper.CheckGroupQuotaEnabled(packageId, ResourceGroups.Web, Quotas.WEB_APPPOOLS);
pnlDefaultDocuments.Visible = PackagesHelper.CheckGroupQuotaEnabled(packageId, ResourceGroups.Web, Quotas.WEB_DEFAULTDOCS); pnlDefaultDocuments.Visible = PackagesHelper.CheckGroupQuotaEnabled(packageId, ResourceGroups.Web, Quotas.WEB_DEFAULTDOCS);
UserSettings settings = ES.Services.Users.GetUserSettings(PanelSecurity.SelectedUserId, "WebPolicy");
if (Utils.ParseBool(settings["EnableDedicatedPool"], false) == true)
chkDedicatedPool.Checked = true;
chkDedicatedPool.Enabled = !(Utils.ParseBool(settings["EnableDedicatedPool"], false));
} }

98
WebsitePanel/Sources/generate_es_proxies.bat
View file

@ -2,5 +2,103 @@ SET WSDL="C:\Program Files (x86)\Microsoft WSE\v3.0\Tools\WseWsdl3.exe"
SET WSE_CLEAN=..\Tools\WseClean.exe SET WSE_CLEAN=..\Tools\WseClean.exe
SET SERVER_URL=http://localhost:9005 SET SERVER_URL=http://localhost:9005
REM %WSDL% %SERVER_URL%/esApplicationsInstaller.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ApplicationsInstallerProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ApplicationsInstallerProxy.cs
REM %WSDL% %SERVER_URL%/esAuditLog.asmx /out:.\WebsitePanel.EnterpriseServer.Client\AuditLogProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\AuditLogProxy.cs
REM %WSDL% %SERVER_URL%/esAuthentication.asmx /out:.\WebsitePanel.EnterpriseServer.Client\AuthenticationProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\AuthenticationProxy.cs
REM %WSDL% %SERVER_URL%/esBackup.asmx /out:.\WebsitePanel.EnterpriseServer.Client\BackupProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\BackupProxy.cs
REM %WSDL% %SERVER_URL%/esBlackBerry.asmx /out:.\WebsitePanel.EnterpriseServer.Client\BlackBerryProxy.cs /namespace:WebsitePanel.EnterpriseServer.HostedSolution /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\BlackBerryProxy.cs
REM %WSDL% %SERVER_URL%/esComments.asmx /out:.\WebsitePanel.EnterpriseServer.Client\CommentsProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\CommentsProxy.cs
REM %WSDL% %SERVER_URL%/esCRM.asmx /out:.\WebsitePanel.EnterpriseServer.Client\CRMProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\CRMProxy.cs
REM %WSDL% %SERVER_URL%/esDatabaseServers.asmx /out:.\WebsitePanel.EnterpriseServer.Client\DatabaseServersProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\DatabaseServersProxy.cs
REM %WSDL% %SERVER_URL%/ecServiceHandler.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ecServiceHandlerProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ecServiceHandlerProxy.cs
REM %WSDL% %SERVER_URL%/ecStorefront.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ecStorefrontProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ecStorefrontProxy.cs
REM %WSDL% %SERVER_URL%/ecStorehouse.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ecStorehouseProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ecStorehouseProxy.cs
%WSDL% %SERVER_URL%/esExchangeServer.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ExchangeServerProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient %WSDL% %SERVER_URL%/esExchangeServer.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ExchangeServerProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
%WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ExchangeServerProxy.cs %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ExchangeServerProxy.cs
REM %WSDL% %SERVER_URL%/esExchangeHostedEdition.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ExchangeHostedEditionProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ExchangeHostedEditionProxy.cs
REM %WSDL% %SERVER_URL%/esFiles.asmx /out:.\WebsitePanel.EnterpriseServer.Client\FilesProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\FilesProxy.cs
REM %WSDL% %SERVER_URL%/esHostedSharePointServers.asmx /out:.\WebsitePanel.EnterpriseServer.Client\HostedSharePointServersProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\HostedSharePointServersProxy.cs
REM %WSDL% %SERVER_URL%/esImport.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ImportProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ImportProxy.cs
REM %WSDL% %SERVER_URL%/esOCS.asmx /out:.\WebsitePanel.EnterpriseServer.Client\OCSProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\OCSProxy.cs
REM %WSDL% %SERVER_URL%/esOperatingSystems.asmx /out:.\WebsitePanel.EnterpriseServer.Client\OperatingSystemsProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\OperatingSystemsProxy.cs
REM %WSDL% %SERVER_URL%/esOrganizations.asmx /out:.\WebsitePanel.EnterpriseServer.Client\OrganizationProxy.cs /namespace:WebsitePanel.EnterpriseServer.HostedSolution /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\OrganizationProxy.cs
REM %WSDL% %SERVER_URL%/esPackages.asmx /out:.\WebsitePanel.EnterpriseServer.Client\PackagesProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\PackagesProxy.cs
REM %WSDL% %SERVER_URL%/esScheduler.asmx /out:.\WebsitePanel.EnterpriseServer.Client\SchedulerProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\SchedulerProxy.cs
REM %WSDL% %SERVER_URL%/esServers.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ServersProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ServersProxy.cs
REM %WSDL% %SERVER_URL%/esSharePointServers.asmx /out:.\WebsitePanel.EnterpriseServer.Client\SharePointServersProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\SharePointServersProxy.cs
REM %WSDL% %SERVER_URL%/esSystem.asmx /out:.\WebsitePanel.EnterpriseServer.Client\SystemProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\SystemProxy.cs
REM %WSDL% %SERVER_URL%/esTasks.asmx /out:.\WebsitePanel.EnterpriseServer.Client\TasksProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\TasksProxy.cs
REM %WSDL% %SERVER_URL%/esUsers.asmx /out:.\WebsitePanel.EnterpriseServer.Client\UsersProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\UsersProxy.cs
REM %WSDL% %SERVER_URL%/esVirtualizationServer.asmx /out:.\WebsitePanel.EnterpriseServer.Client\VirtualizationServerProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\VirtualizationServerProxy.cs
REM %WSDL% %SERVER_URL%/esWebApplicationGallery.asmx /out:.\WebsitePanel.EnterpriseServer.Client\WebApplicationGalleryProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\WebApplicationGalleryProxy.cs
REM %WSDL% %SERVER_URL%/esWebServers.asmx /out:.\WebsitePanel.EnterpriseServer.Client\WebServersProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\WebServersProxy.cs
REM %WSDL% %SERVER_URL%/esVirtualizationServerForPrivateCloud.asmx /out:.\WebsitePanel.EnterpriseServer.Client\VirtualizationServerProxyForPrivateCloud.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\VirtualizationServerProxyForPrivateCloud.cs
REM %WSDL% %SERVER_URL%/esLync.asmx /out:.\WebsitePanel.EnterpriseServer.Client\LyncProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\LyncProxy.cs

25
WebsitePanel/build.xml
View file

@ -1,10 +1,10 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="C:\Program Files\MSBuild\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/> <Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
<PropertyGroup> <PropertyGroup>
<Version>1.2.2.0</Version> <Version>1.2.2.0</Version>
<FileVersion>1.2.2.1</FileVersion> <FileVersion>1.2.2.1</FileVersion>
<VersionLabel>1.2.2</VersionLabel> <VersionLabel>1.2.2</VersionLabel>
<ReleaseDate>2012-05-13</ReleaseDate> <ReleaseDate>2012-08-01</ReleaseDate>
<BuildConfiguration>Release</BuildConfiguration> <BuildConfiguration>Release</BuildConfiguration>
<RootFolder>..</RootFolder> <RootFolder>..</RootFolder>
<TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder> <TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder>
@ -15,12 +15,13 @@
<BuildFolder>$(TrunkFolder)\Build\$(BuildConfiguration)</BuildFolder> <BuildFolder>$(TrunkFolder)\Build\$(BuildConfiguration)</BuildFolder>
<DeployFolder>$(TrunkFolder)\Deploy\$(BuildConfiguration)</DeployFolder> <DeployFolder>$(TrunkFolder)\Deploy\$(BuildConfiguration)</DeployFolder>
<PreviousBuildFolder>C:\Projects\WebsitePanel-1.2.1\$(BuildConfiguration)</PreviousBuildFolder> <PreviousBuildFolder>$(RootFolder)\..\prev\$(BuildConfiguration)</PreviousBuildFolder>
<DiffCmd>$(TrunkFolder)\Tools\Diff.exe</DiffCmd> <DiffCmd>$(TrunkFolder)\Tools\Diff.exe</DiffCmd>
<SqlCmd>"C:\Program Files\Microsoft SQL Server\110\Tools\Binn\sqlcmd.exe" -S (local)\SQLEXPRESS -E</SqlCmd> <SqlCmd>"$(ProgramFiles)\Microsoft SQL Server\100\Tools\Binn\sqlcmd.exe" -S (local)\SQLEXPRESS -E</SqlCmd>
<MSDeployPath>"C:\Program Files\IIS\Microsoft Web Deploy V2\msdeploy.exe"</MSDeployPath> <MSDeployPath Condition="Exists('$(ProgramFiles)\IIS\Microsoft Web Deploy\msdeploy.exe')">"$(ProgramFiles)\IIS\Microsoft Web Deploy\msdeploy.exe"</MSDeployPath>
<MSDeployPath Condition="Exists('$(ProgramFiles)\IIS\Microsoft Web Deploy V2\msdeploy.exe')">"$(ProgramFiles)\IIS\Microsoft Web Deploy V2\msdeploy.exe"</MSDeployPath>
<DataBaseName>WebsitePanel_build</DataBaseName> <DataBaseName>WebsitePanel_build</DataBaseName>
<MSDeployConnectionString>server=(local)\SQLEXPRESS;database=$(DataBaseName);Integrated Security=true;</MSDeployConnectionString> <MSDeployConnectionString>server=(local)\SQLEXPRESS;database=$(DataBaseName);Integrated Security=true;</MSDeployConnectionString>
@ -31,7 +32,8 @@
<ImportCsvSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.CsvBulk\bin\$(BuildConfiguration)</ImportCsvSrc> <ImportCsvSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.CsvBulk\bin\$(BuildConfiguration)</ImportCsvSrc>
<ImportEnterpriseSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.Enterprise\bin\$(BuildConfiguration)</ImportEnterpriseSrc> <ImportEnterpriseSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.Enterprise\bin\$(BuildConfiguration)</ImportEnterpriseSrc>
<AWStatsViewerSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.AWStats.Viewer</AWStatsViewerSrc> <AWStatsViewerSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.AWStats.Viewer</AWStatsViewerSrc>
<WSPTransportAgentSrc>$(TrunkFolder)\Sources\Tools\WSPTransportAgent</WSPTransportAgentSrc>
<WSPTransportAgentSrc>$(TrunkFolder)\Sources\Tools\WSPTransportAgent</WSPTransportAgentSrc>
<ServerBuild>$(BuildFolder)\Server</ServerBuild> <ServerBuild>$(BuildFolder)\Server</ServerBuild>
<EnterpriseServerBuild>$(BuildFolder)\EnterpriseServer</EnterpriseServerBuild> <EnterpriseServerBuild>$(BuildFolder)\EnterpriseServer</EnterpriseServerBuild>
@ -39,17 +41,14 @@
<ImportCsvBuild>$(BuildFolder)\Import.CsvBulk</ImportCsvBuild> <ImportCsvBuild>$(BuildFolder)\Import.CsvBulk</ImportCsvBuild>
<ImportEnterpriseBuild>$(BuildFolder)\Import.Enterprise</ImportEnterpriseBuild> <ImportEnterpriseBuild>$(BuildFolder)\Import.Enterprise</ImportEnterpriseBuild>
<AWStatsViewerBuild>$(BuildFolder)\AWStats.Viewer</AWStatsViewerBuild> <AWStatsViewerBuild>$(BuildFolder)\AWStats.Viewer</AWStatsViewerBuild>
<WSPTransportAgentBuild>$(BuildFolder)\WSPTransportAgent</WSPTransportAgentBuild>
<WSPTransportAgentBuild>$(BuildFolder)\WSPTransportAgent</WSPTransportAgentBuild>
</PropertyGroup> </PropertyGroup>
<Target Name="GenerateBuildVersionFiles" Inputs="build.xml" Outputs="$(TrunkFolder)\Sources\VersionInfo.cs;$(TrunkFolder)\Sources\VersionInfo.vb"> <Target Name="GenerateBuildVersionFiles" Inputs="build.xml" Outputs="$(TrunkFolder)\Sources\VersionInfo.cs;$(TrunkFolder)\Sources\VersionInfo.vb">
<AssemblyInfo CodeLanguage="CS" OutputFile="$(TrunkFolder)\Sources\VersionInfo.cs" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation." <AssemblyInfo CodeLanguage="CS" OutputFile="$(TrunkFolder)\Sources\VersionInfo.cs" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation." AssemblyVersion="$(Version)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(VersionLabel)" />
AssemblyVersion="$(Version)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(VersionLabel)" /> <AssemblyInfo CodeLanguage="VB" OutputFile="$(TrunkFolder)\Sources\VersionInfo.vb" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation." AssemblyVersion="$(Version)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(VersionLabel)" />
<AssemblyInfo CodeLanguage="VB" OutputFile="$(TrunkFolder)\Sources\VersionInfo.vb" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation."
AssemblyVersion="$(Version)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(VersionLabel)" />
</Target> </Target>
<Target Name="CompileSources" DependsOnTargets="GenerateBuildVersionFiles"> <Target Name="CompileSources" DependsOnTargets="GenerateBuildVersionFiles">

2
WebsitePanel/deploy-debug.bat
View file

@ -1 +1 @@
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:Deploy /property:BuildConfiguration=Debug /v:n /fileLogger /m %windir%\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe build.xml /target:Deploy /property:BuildConfiguration=Debug /v:n /fileLogger /m