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

Merge Changes from Helicon for WebPI 4.0

Browse source
This commit is contained in:
Virtuworks 2012-08-14 20:31:38 -04:00
commit d40318256a
23 changed files with 182 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

4
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebAppGallery/WebAppGalleryController.cs
View file

@ -78,12 +78,12 @@ namespace WebsitePanel.EnterpriseServer
if (Utils.ParseBool(serviceSettings["FeedEnableMicrosoft"], true))
{
arFeeds.Add("https://www.microsoft.com/web/webpi/3.0/WebProductList.xml");
arFeeds.Add(esServers.MAIN_WPI_FEED);
}
if (Utils.ParseBool(serviceSettings["FeedEnableHelicon"], true))
{
arFeeds.Add("http://www.helicontech.com/zoo/feed/wsp");
arFeeds.Add(esServers.HELICON_WPI_FEED);
}
string additionalFeeds = serviceSettings["FeedUrls"];

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

@ -54,6 +54,9 @@ namespace WebsitePanel.EnterpriseServer
[ToolboxItem(false)]
public class esServers : System.Web.Services.WebService
{
public const string MAIN_WPI_FEED = "https://www.microsoft.com/web/webpi/4.0/WebProductList.xml";
public const string HELICON_WPI_FEED = "http://www.helicontech.com/zoo/feed/wsp4";
#region Servers
[WebMethod]
public List<ServerInfo> GetAllServers()
@ -677,12 +680,12 @@ namespace WebsitePanel.EnterpriseServer
if (Utils.ParseBool(wpiSettings["FeedEnableMicrosoft"] ,true))
{
arFeeds.Add( "https://www.microsoft.com/web/webpi/3.0/WebProductList.xml" );
arFeeds.Add( MAIN_WPI_FEED );
}
if (Utils.ParseBool(wpiSettings["FeedEnableHelicon"] ,true))
{
arFeeds.Add( "http://www.helicontech.com/zoo/feed/wsp" );
arFeeds.Add( HELICON_WPI_FEED );
}
string additionalFeeds = wpiSettings["FeedUrls"];