merge commit

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Scheduling/Scheduler.cs

@@ -163,12 +163,13 @@ namespace WebsitePanel.EnterpriseServer
                     counter++;
                 }
 
-                // skip execution if the current task is still running
+                    // skip execution if the current task is still running
-                scheduledTasks = TaskManager.GetScheduledTasks();
+                    scheduledTasks = TaskManager.GetScheduledTasks();
-                if (!scheduledTasks.ContainsKey(schedule.ScheduleInfo.ScheduleId))
+                    if (!scheduledTasks.ContainsKey(schedule.ScheduleInfo.ScheduleId))
-                {
+                    {
-                    // run the schedule in the separate thread
+                        // run the schedule in the separate thread
-                    schedule.Run();
+                        schedule.Run();
+                    }
                 }
             }
             catch (Exception Ex)
@@ -177,7 +178,7 @@ namespace WebsitePanel.EnterpriseServer
                 {
                     TaskManager.WriteError(string.Format("RunSchedule Error : {0}", Ex.Message));
                 }
-                catch(Exception)
+                catch (Exception)
                 {
                 }
             }

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config

@@ -5,11 +5,11 @@
   </configSections>
   <!-- Connection strings -->
   <connectionStrings>
-        <add name="EnterpriseServer" connectionString="server=2012PROV01;database=WebsitePanel;uid=WebsitePanel;pwd=5qc7ftf6q42byc08z857;Connection Timeout=60;" />
+        <add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=sa;pwd=Password12" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <appSettings>
     <!-- Encryption util settings -->
-    <add key="WebsitePanel.CryptoKey" value="fbd61z4gwsc2m01x7xn2" />
+    <add key="WebsitePanel.CryptoKey" value="1234567890" />
     <!-- A1D4KDHUE83NKHddF -->
     <add key="WebsitePanel.EncryptionEnabled" value="true" />
     <!-- Web Applications -->
@@ -18,10 +18,6 @@
     <!-- Maximum waiting time when sending request to the remote server
          The value is in seconds. "-1" - infinite. -->
     <add key="WebsitePanel.EnterpriseServer.ServerRequestTimeout" value="3600" />
-    <!-- Alternative connection string, pulls the value from registry -->
-    <add key="WebsitePanel.AltConnectionString" value="ConnectionString" />
-    <add key="WebsitePanel.AltCryptoKey" value="CryptoKey" />
-    <add key="WebsitePanel.DistableScheduler"  value="false" />
   </appSettings>
   <system.web>
     <!-- Disable any authentication -->

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/IIS60_Settings.ascx.resx

@@ -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="chkAssignIPAutomatically.Text" xml:space="preserve">
     <value>Automatically allocate "dedicated" IP addresses on space creation</value>
@@ -129,7 +129,6 @@
   <data name="FilterDialogButton.Text" xml:space="preserve">
     <value>Click to create a filter...</value>
   </data>
-  
   <data name="GalleryFeedFilter.Text" xml:space="preserve">
     <value>Gallery feed filter:</value>
   </data>
@@ -235,4 +234,7 @@
   <data name="ipAddress.SelectValueText" xml:space="preserve">
     <value>&lt;All unassigned&gt;</value>
   </data>
+  <data name="txtPublicSharedIP.Text" xml:space="preserve">
+    <value>Web Sites Public Shared Address:</value>
+  </data>
 </root>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Exchange_Settings.ascx.designer.cs

@@ -1,3 +1,31 @@
+// 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>
 //     This code was generated by a tool.

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS60_Settings.ascx

@@ -20,6 +20,14 @@
                 <uc1:SelectIPAddress ID="ipAddress" runat="server" ServerIdParam="ServerID" />
 			</td>
 		</tr>
+		<tr>
+			<td class="Normal" width="200" nowrap>
+			    <asp:Label ID="lblPublicSharedIP" runat="server" meta:resourcekey="lblPublicSharedIP" Text="Web Sites Public Shared IP Address:"></asp:Label>
+			</td>
+			<td width="100%">
+                <asp:TextBox ID="txtPublicSharedIP" runat="server" Width="200" CssClass="NormalTextBox"></asp:TextBox>
+			</td>
+		</tr>
 		<tr>
 		    <td class="Normal" valign="top">
 		        <asp:Label ID="lblGroupName" runat="server" meta:resourcekey="lblGroupName" Text="Web Users Group Name:"></asp:Label>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS60_Settings.ascx.cs

@@ -102,6 +102,7 @@ namespace WebsitePanel.Portal.ProviderControls
         {
             ipAddress.AddressId = (settings["SharedIP"] != null) ? Utils.ParseInt(settings["SharedIP"], 0) : 0;
             ipAddress.SelectValueText = GetLocalizedString("ipAddress.SelectValueText");
+            txtPublicSharedIP.Text = settings["PublicSharedIP"];
 
             txtWebGroupName.Text = settings["WebGroupName"];
             chkAssignIPAutomatically.Checked = Utils.ParseBool(settings["AutoAssignDedicatedIP"], true);
@@ -140,6 +141,7 @@ namespace WebsitePanel.Portal.ProviderControls
         public void SaveSettings(StringDictionary settings)
         {
             settings["SharedIP"] = ipAddress.AddressId.ToString();
+            settings["PublicSharedIP"] = txtPublicSharedIP.Text.Trim();
             settings["WebGroupName"] = txtWebGroupName.Text.Trim();
             settings["AutoAssignDedicatedIP"] = chkAssignIPAutomatically.Checked.ToString();
 

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS60_Settings.ascx.designer.cs

@@ -1,31 +1,3 @@
-// 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>
 //     This code was generated by a tool.
@@ -67,6 +39,24 @@ namespace WebsitePanel.Portal.ProviderControls {
         /// </remarks>
         protected global::WebsitePanel.Portal.SelectIPAddress ipAddress;
         
+        /// <summary>
+        /// lblPublicSharedIP 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 lblPublicSharedIP;
+        
+        /// <summary>
+        /// txtPublicSharedIP 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 txtPublicSharedIP;
+        
         /// <summary>
         /// lblGroupName control.
         /// </summary>