Merge with default

WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/WPIEntries.cs

@@ -33,6 +33,7 @@ using System.Text;
 
 namespace WebsitePanel.Server
 {
+    [Serializable]
     public class WPIProduct
     {
         private string productId;
@@ -45,11 +46,13 @@ namespace WebsitePanel.Server
         private string downloadedLocation;
         private string longDescription;
         private bool isInstalled;
+        private bool isUpgrade;
         private int fileSize;
         private DateTime published;
         private string author;
         private string authorUri;
 
+
         public WPIProduct()
         {
         }
@@ -91,6 +94,12 @@ namespace WebsitePanel.Server
             set { this.isInstalled = value; }
         }
 
+        public bool IsUpgrade
+        {
+            get { return this.isUpgrade; }
+            set { this.isUpgrade = value; }
+        }
+
         public string Version
         {
             get { return this.version; }
@@ -138,6 +147,11 @@ namespace WebsitePanel.Server
             get { return authorUri; }
             set { authorUri = value; }
         }
+
+        public new string ToString()
+        {
+            return productId;
+        }
     }
 
     public class WPITab
@@ -185,6 +199,8 @@ namespace WebsitePanel.Server
 
     public class WPIKeyword
     {
+        public const string HOSTING_PACKAGE_KEYWORD = "ZooPackage";
+
         private string id;
         private string text;
 

WebsitePanel/Sources/WebsitePanel.Providers.Base/HeliconZoo/IHeliconZooServer.cs

@@ -0,0 +1,96 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using WebsitePanel.Providers.HostedSolution;
+using WebsitePanel.Providers.ResultObjects;
+using WebsitePanel.Providers.Web;
+using WebsitePanel.Providers.WebAppGallery;
+using WebsitePanel.Providers.Common;
+
+namespace WebsitePanel.Providers.HeliconZoo
+{
+    [Serializable]
+    public class HeliconZooEngine //: ServiceProviderItem
+    {
+        public string name { get; set; }
+        public string displayName { get; set; }
+        public string fullPath { get; set; }
+        public string arguments { get; set; }
+        public string transport { get; set; }
+        public string protocol { get; set; }
+        public string host { get; set; }
+        public long portLower { get; set; }
+        public long portUpper { get; set; }
+        public long maxInstances { get; set; }
+        public long minInstances { get; set; }
+        public long timeLimit { get; set; }
+        public long gracefulShutdownTimeout { get; set; }
+        public long memoryLimit { get; set; }
+
+        public HeliconZooEnv[] environmentVariables;
+
+        public bool isUserEngine { get; set; }
+        public bool disabled { get; set; }
+    }
+
+    [Serializable]
+    public class HeliconZooEnv
+    {
+        public string Name { get; set; }
+        public string Value { get; set; }
+    }
+
+    [Serializable]
+    public class ShortHeliconZooEngine
+    {
+        public string Name { get; set; }
+        public string DisplayName { get; set; }
+        public bool Enabled { get; set; }
+
+        public string KeywordedName
+        {
+            get
+            {
+                // python.2.7.wsgi -> python27wsgi
+                return Name.Replace(".", "");
+            }
+        }
+    }
+
+    public interface IHeliconZooServer
+    {
+        HeliconZooEngine[] GetEngines();
+        void SetEngines(HeliconZooEngine[] userEngines);
+        bool IsEnginesEnabled();
+        void SwithEnginesEnabled(bool enabled);
+        string[] GetEnabledEnginesForSite(string siteId);
+        void SetEnabledEnginesForSite(string siteId, string[] engineNames);
+    }
+}

WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj

@@ -75,6 +75,7 @@
     <Compile Include="Common\ErrorCodes.cs" />
     <Compile Include="Common\PasswdHelper.cs" />
     <Compile Include="Common\WPIEntries.cs" />
+    <Compile Include="HeliconZoo\IHeliconZooServer.cs" />
     <Compile Include="HostedSolution\BaseReport.cs" />
     <Compile Include="HostedSolution\BaseStatistics.cs" />
     <Compile Include="HostedSolution\BlackBerryErrorsCodes.cs" />