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

update wpi feed url to v 4.0

Browse source
This commit is contained in:
ruslan 2012-08-14 10:40:55 +03:00
parent 5d88284609
commit 54d9bb207b
5 changed files with 14 additions and 6 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)) 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)) 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"]; string additionalFeeds = serviceSettings["FeedUrls"];

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

@ -54,6 +54,9 @@ namespace WebsitePanel.EnterpriseServer
[ToolboxItem(false)] [ToolboxItem(false)]
public class esServers : System.Web.Services.WebService 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 #region Servers
[WebMethod] [WebMethod]
public List<ServerInfo> GetAllServers() public List<ServerInfo> GetAllServers()
@ -677,12 +680,12 @@ namespace WebsitePanel.EnterpriseServer
if (Utils.ParseBool(wpiSettings["FeedEnableMicrosoft"] ,true)) 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)) if (Utils.ParseBool(wpiSettings["FeedEnableHelicon"] ,true))
{ {
arFeeds.Add( "http://www.helicontech.com/zoo/feed/wsp" ); arFeeds.Add( HELICON_WPI_FEED );
} }
string additionalFeeds = wpiSettings["FeedUrls"]; string additionalFeeds = wpiSettings["FeedUrls"];

3
WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WebApplicationGallery.cs
View file

@ -71,7 +71,8 @@ namespace WebsitePanel.Providers.Web
public const string WAG_XML_FEED_CACHE_KEY = "WAG_XML_FEED_CACHE_KEY"; public const string WAG_XML_FEED_CACHE_KEY = "WAG_XML_FEED_CACHE_KEY";
public const int WEB_APPLICATIONS_CACHE_STORE_MINUTES = 60; public const int WEB_APPLICATIONS_CACHE_STORE_MINUTES = 60;
public const int XML_FEED_RECOVERY_ATTEMPTS = 10; public const int XML_FEED_RECOVERY_ATTEMPTS = 10;
public const string WAG_DEFAULT_FEED_URL = "https://www.microsoft.com/web/webpi/3.0/WebApplicationList.xml"; // public const string WAG_DEFAULT_FEED_URL = "https://www.microsoft.com/web/webpi/3.0/WebApplicationList.xml";
public const string WAG_DEFAULT_FEED_URL = "https://www.microsoft.com/web/webpi/4.0/webapplicationlist.xml";
// well-known parameters matching // well-known parameters matching
public readonly Dictionary<string, DeploymentParameterWellKnownTag> wellKnownParameters public readonly Dictionary<string, DeploymentParameterWellKnownTag> wellKnownParameters

3
WebsitePanel/Sources/WebsitePanel.Server.WPIService/WebsitePanel.Server.WPIService.csproj
View file

@ -68,6 +68,9 @@
<Name>WebsitePanel.Server.WPIServiceContract</Name> <Name>WebsitePanel.Server.WPIServiceContract</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent> <PostBuildEvent>

3
WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs
View file

@ -60,7 +60,8 @@ namespace WebsitePanel.Server.Code
private readonly List<string> _feeds; private readonly List<string> _feeds;
private string _webPIinstallersFolder; private string _webPIinstallersFolder;
private const string MainWpiFeed = "https://www.microsoft.com/web/webpi/3.0/webproductlist.xml"; //private const string MainWpiFeed = "https://www.microsoft.com/web/webpi/3.0/webproductlist.xml";
private const string MainWpiFeed = "https://www.microsoft.com/web/webpi/4.0/WebProductList.xml";
private const string IisChoiceProduct = "StaticContent"; private const string IisChoiceProduct = "StaticContent";
private const string WebMatrixChoiceProduct = "WebMatrix"; private const string WebMatrixChoiceProduct = "WebMatrix";
private ProductManager _productManager; private ProductManager _productManager;