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

webdav portal config refactoring

Browse source
This commit is contained in:
vfedosevich 2015-02-24 23:17:49 -08:00
parent 82a9151241
commit 4122caa16d
21 changed files with 39 additions and 2841 deletions
Download patch file Download diff file Expand all files Collapse all files

16
WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/EnterpriseServerElement.cs Normal file
View file

@ -0,0 +1,16 @@
using System.Configuration;
namespace WebsitePanel.WebDav.Core.Config.WebConfigSections
{
public class EnterpriseServerElement : ConfigurationElement
{
private const string ValueKey = "url";
[ConfigurationProperty(ValueKey, IsKey = true, IsRequired = true)]
public string Value
{
get { return (string)this[ValueKey]; }
set { this[ValueKey] = value; }
}
}
}

8
WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/WebDavExplorerConfigurationSettingsSection.cs
View file

@ -9,6 +9,7 @@ namespace WebsitePanel.WebDavPortal.WebConfigSections
private const string WebdavRootKey = "webdavRoot";
private const string AuthTimeoutCookieNameKey = "authTimeoutCookieName";
private const string AppName = "applicationName";
private const string EnterpriseServerUrlNameKey = "enterpriseServer";
private const string WebsitePanelConstantUserKey = "websitePanelConstantUser";
private const string ElementsRenderingKey = "elementsRendering";
private const string Rfc2898CryptographyKey = "rfc2898Cryptography";
@ -28,6 +29,13 @@ namespace WebsitePanel.WebDavPortal.WebConfigSections
set { this[AuthTimeoutCookieNameKey] = value; }
}
[ConfigurationProperty(EnterpriseServerUrlNameKey, IsRequired = true)]
public EnterpriseServerElement EnterpriseServerUrl
{
get { return (EnterpriseServerElement)this[EnterpriseServerUrlNameKey]; }
set { this[EnterpriseServerUrlNameKey] = value; }
}
[ConfigurationProperty(WebdavRootKey, IsRequired = true)]
public WebdavRootElement WebdavRoot
{

5
WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebDavAppConfigManager.cs
View file

@ -47,6 +47,11 @@ namespace WebsitePanel.WebDav.Core.Config
get { return _configSection.AuthTimeoutCookieName.Value; }
}
public string EnterpriseServerUrl
{
get { return _configSection.EnterpriseServerUrl.Value; }
}
public ElementsRendering ElementsRendering { get; private set; }
public WebsitePanelConstantUserParameters WebsitePanelConstantUserParameters { get; private set; }
public SessionKeysCollection SessionKeys { get; private set; }

3
WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Managers/Users/IUserSettingsManager.cs
View file

@ -1,5 +1,4 @@
using WebsitePanel.EnterpriseServer;
using WebsitePanel.WebDav.Core.Entities.Account;
using WebsitePanel.WebDav.Core.Entities.Account;
using WebsitePanel.WebDav.Core.Entities.Account.Enums;
namespace WebsitePanel.WebDav.Core.Interfaces.Managers.Users

4
WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Storages/ITtlStorage.cs
View file

@ -1,6 +1,4 @@
using WebsitePanel.Ecommerce.EnterpriseServer;
namespace WebsitePanel.WebDav.Core.Interfaces.Storages
namespace WebsitePanel.WebDav.Core.Interfaces.Storages
{
public interface ITtlStorage : IKeyValueStorage
{

3
WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/Users/UserSettingsManager.cs
View file

@ -1,5 +1,4 @@
using WebsitePanel.EnterpriseServer;
using WebsitePanel.WebDav.Core.Entities.Account;
using WebsitePanel.WebDav.Core.Entities.Account;
using WebsitePanel.WebDav.Core.Entities.Account.Enums;
using WebsitePanel.WebDav.Core.Helper;
using WebsitePanel.WebDav.Core.Interfaces.Managers.Users;

16
WebsitePanel/Sources/WebsitePanel.WebDav.Core/WebsitePanel.WebDav.Core.csproj
View file

@ -44,8 +44,7 @@
</Reference>
<Reference Include="Microsoft.Web.Services3, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Scheduler Domains\WebsitePanel\Bin\Microsoft.Web.Services3.dll</HintPath>
<Private>True</Private>
<HintPath>..\..\Bin\Microsoft.Web.Services3.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
@ -89,13 +88,13 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WebsitePanel.EnterpriseServer.Base">
<HintPath>..\WebsitePanel.WebPortal\Bin\WebsitePanel.EnterpriseServer.Base.dll</HintPath>
<HintPath>..\..\Bin\WebsitePanel.EnterpriseServer.Base.dll</HintPath>
</Reference>
<Reference Include="WebsitePanel.EnterpriseServer.Client">
<HintPath>..\WebsitePanel.WebPortal\Bin\WebsitePanel.EnterpriseServer.Client.dll</HintPath>
<HintPath>..\..\Bin\WebsitePanel.EnterpriseServer.Client.dll</HintPath>
</Reference>
<Reference Include="WebsitePanel.Providers.Base">
<HintPath>..\WebsitePanel.WebPortal\Bin\WebsitePanel.Providers.Base.dll</HintPath>
<HintPath>..\..\Bin\WebsitePanel.Providers.Base.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@ -113,6 +112,7 @@
<Compile Include="Config\WebConfigSections\ApplicationNameElement.cs" />
<Compile Include="Config\WebConfigSections\AuthTimeoutCookieNameElement.cs" />
<Compile Include="Config\WebConfigSections\ElementsRenderingElement.cs" />
<Compile Include="Config\WebConfigSections\EnterpriseServerElement.cs" />
<Compile Include="Config\WebConfigSections\FileIconsElement.cs" />
<Compile Include="Config\WebConfigSections\FileIconsElementCollection.cs" />
<Compile Include="Config\WebConfigSections\FilesToIgnoreElement.cs" />
@ -196,12 +196,6 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\WebsitePanel.WebPortal\WebsitePanel.WebPortal.csproj">
<Project>{C99EFB18-FFE7-45BB-8CA8-29336F3E8C68}</Project>
<Name>WebsitePanel.WebPortal</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\HttpErrors.resx">
<Generator>ResXFileCodeGenerator</Generator>

3
WebsitePanel/Sources/WebsitePanel.WebDav.Core/Wsp/Framework/WSP.cs
View file

@ -34,7 +34,6 @@ using WebsitePanel.EnterpriseServer;
using WebsitePanel.EnterpriseServer.HostedSolution;
using WebsitePanel.WebDav.Core.Config;
using WebsitePanel.WebDav.Core.Security.Cryptography;
using WebsitePanel.WebPortal;
namespace WebsitePanel.WebDav.Core.Wsp.Framework
{
@ -268,7 +267,7 @@ namespace WebsitePanel.WebDav.Core.Wsp.Framework
public void ConfigureEnterpriseServerProxy(WebServicesClientProtocol proxy, bool applyPolicy)
{
// load ES properties
string serverUrl = PortalConfiguration.SiteSettings["EnterpriseServer"];
string serverUrl = WebDavAppConfigManager.Instance.EnterpriseServerUrl;
EnterpriseServerProxyConfigurator cnfg = new EnterpriseServerProxyConfigurator();
cnfg.EnterpriseServerUrl = serverUrl;