Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move configuration classes to the Services project #538

Merged
merged 3 commits into from Dec 17, 2018
Merged

Move configuration classes to the Services project #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bf8da8
Move all config classes from the Configuration project to Services an…
tusmester Dec 14, 2018
0ee0c7c
Remove unnecessary configuration dll line from nuspec file.
tusmester Dec 14, 2018
26ed5f8
Merge changes from dev.
tusmester Dec 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 0 additions & 24 deletions src/Configuration/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

112 changes: 0 additions & 112 deletions src/Configuration/SenseNet.Configuration.csproj
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/SenseNet.sln
View file
Open in desktop
Expand Up @@ -12,8 +12,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SenseNet.Storage", "Storage
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SenseNet.Services", "Services\SenseNet.Services.csproj", "{B72529C8-FEB1-49F5-B08B-56055B58F296}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SenseNet.Configuration", "Configuration\SenseNet.Configuration.csproj", "{A19F707C-B1C3-45C7-AE38-E7B7F30C1161}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SnAdminRuntime", "Tools\SnAdminRuntime\SnAdminRuntime.csproj", "{891B1FD9-CA73-4129-8D1D-D6663F01866C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SenseNet.Common", "Common\SenseNet.Common.csproj", "{A453E920-29C0-45CD-984C-0D8E3631B1E3}"
Expand Down Expand Up @@ -99,18 +97,6 @@ Global
{B72529C8-FEB1-49F5-B08B-56055B58F296}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{B72529C8-FEB1-49F5-B08B-56055B58F296}.Release|x64.ActiveCfg = Release|Any CPU
{B72529C8-FEB1-49F5-B08B-56055B58F296}.Release|x86.ActiveCfg = Release|Any CPU
{A19F707C-B1C3-45C7-AE38-E7B7F30C1161}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A19F707C-B1C3-45C7-AE38-E7B7F30C1161}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A19F707C-B1C3-45C7-AE38-E7B7F30C1161}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{A19F707C-B1C3-45C7-AE38-E7B7F30C1161}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{A19F707C-B1C3-45C7-AE38-E7B7F30C1161}.Debug|x64.ActiveCfg = Debug|Any CPU
{A19F707C-B1C3-45C7-AE38-E7B7F30C1161}.Debug|x86.ActiveCfg = Debug|Any CPU
{A19F707C-B1C3-45C7-AE38-E7B7F30C1161}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A19F707C-B1C3-45C7-AE38-E7B7F30C1161}.Release|Any CPU.Build.0 = Release|Any CPU
{A19F707C-B1C3-45C7-AE38-E7B7F30C1161}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{A19F707C-B1C3-45C7-AE38-E7B7F30C1161}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{A19F707C-B1C3-45C7-AE38-E7B7F30C1161}.Release|x64.ActiveCfg = Release|Any CPU
{A19F707C-B1C3-45C7-AE38-E7B7F30C1161}.Release|x86.ActiveCfg = Release|Any CPU
{891B1FD9-CA73-4129-8D1D-D6663F01866C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{891B1FD9-CA73-4129-8D1D-D6663F01866C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{891B1FD9-CA73-4129-8D1D-D6663F01866C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -339,7 +325,6 @@ Global
{786E6165-CA02-45A9-BF58-207A45D7D6DF} = {2997D17C-A736-43E5-B3DD-11D11AC7DF17}
{5DB4DDBA-81F6-4D81-943A-18F3178B3355} = {2997D17C-A736-43E5-B3DD-11D11AC7DF17}
{B72529C8-FEB1-49F5-B08B-56055B58F296} = {2997D17C-A736-43E5-B3DD-11D11AC7DF17}
{A19F707C-B1C3-45C7-AE38-E7B7F30C1161} = {2997D17C-A736-43E5-B3DD-11D11AC7DF17}
{891B1FD9-CA73-4129-8D1D-D6663F01866C} = {875EF569-4684-473D-A2D4-A35B20B4A07C}
{A453E920-29C0-45CD-984C-0D8E3631B1E3} = {2997D17C-A736-43E5-B3DD-11D11AC7DF17}
{78FEBD73-8BC4-45B9-9B31-D512E1AFAD60} = {2997D17C-A736-43E5-B3DD-11D11AC7DF17}
Expand Down
204 changes: 102 additions & 102 deletions src/Configuration/AuthSettingElement.cs → ...uration/FormsADAuth/AuthSettingElement.cs
View file
Open in desktop
@@ -1,102 +1,102 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Configuration;
namespace SenseNet.Configuration
{
public class AuthSettingElement : ConfigurationElement
{
/* ==================================================================================== Public Consts */
public const string LoginProperty = "sAMAccountName";
/* ==================================================================================== Members */
private const string VirtualADUserName = "virtualADUser";
private const string CustomLoginPropertyName = "customLoginProperty";
private const string ADServerName = "adServer";
private const string DomainName = "domain";
private const string CustomADAdminAccountNameName = "customADAdminAccountName";
private const string CustomADAdminAccountPwdName = "customADAdminAccountPwd";
/* ==================================================================================== Configuration element properties */
[ConfigurationProperty(VirtualADUserName, DefaultValue = "false", IsRequired = false)]
public Boolean VirtualADUser
{
get
{
return (Boolean)this[VirtualADUserName];
}
set
{
this[VirtualADUserName] = value;
}
}
[ConfigurationProperty(CustomLoginPropertyName)]
public string CustomLoginProperty
{
get
{
return (string)this[CustomLoginPropertyName];
}
set
{
this[CustomLoginPropertyName] = value;
}
}
[ConfigurationProperty(ADServerName)]
public string ADServer
{
get
{
var adPath = (string) this[ADServerName];
if (!adPath.StartsWith("LDAP://"))
adPath = string.Concat("LDAP://", adPath);
return adPath;
}
set
{
this[ADServerName] = value;
}
}
[ConfigurationProperty(DomainName)]
public string Domain
{
get
{
return (string)this[DomainName];
}
set
{
this[DomainName] = value;
}
}
[ConfigurationProperty(CustomADAdminAccountNameName)]
public string CustomADAdminAccountName
{
get
{
return (string)this[CustomADAdminAccountNameName];
}
set
{
this[CustomADAdminAccountNameName] = value;
}
}
[ConfigurationProperty(CustomADAdminAccountPwdName)]
public string CustomADAdminAccountPwd
{
get
{
return (string)this[CustomADAdminAccountPwdName];
}
set
{
this[CustomADAdminAccountPwdName] = value;
}
}
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Configuration;

namespace SenseNet.Configuration
{
public class AuthSettingElement : ConfigurationElement
{
/* ==================================================================================== Public Consts */
public const string LoginProperty = "sAMAccountName";


/* ==================================================================================== Members */
private const string VirtualADUserName = "virtualADUser";
private const string CustomLoginPropertyName = "customLoginProperty";
private const string ADServerName = "adServer";
private const string DomainName = "domain";
private const string CustomADAdminAccountNameName = "customADAdminAccountName";
private const string CustomADAdminAccountPwdName = "customADAdminAccountPwd";


/* ==================================================================================== Configuration element properties */
[ConfigurationProperty(VirtualADUserName, DefaultValue = "false", IsRequired = false)]
public Boolean VirtualADUser
{
get
{
return (Boolean)this[VirtualADUserName];
}
set
{
this[VirtualADUserName] = value;
}
}
[ConfigurationProperty(CustomLoginPropertyName)]
public string CustomLoginProperty
{
get
{
return (string)this[CustomLoginPropertyName];
}
set
{
this[CustomLoginPropertyName] = value;
}
}
[ConfigurationProperty(ADServerName)]
public string ADServer
{
get
{
var adPath = (string) this[ADServerName];
if (!adPath.StartsWith("LDAP://"))
adPath = string.Concat("LDAP://", adPath);

return adPath;
}
set
{
this[ADServerName] = value;
}
}
[ConfigurationProperty(DomainName)]
public string Domain
{
get
{
return (string)this[DomainName];
}
set
{
this[DomainName] = value;
}
}
[ConfigurationProperty(CustomADAdminAccountNameName)]
public string CustomADAdminAccountName
{
get
{
return (string)this[CustomADAdminAccountNameName];
}
set
{
this[CustomADAdminAccountNameName] = value;
}
}
[ConfigurationProperty(CustomADAdminAccountPwdName)]
public string CustomADAdminAccountPwd
{
get
{
return (string)this[CustomADAdminAccountPwdName];
}
set
{
this[CustomADAdminAccountPwdName] = value;
}
}
}
}