Changeset 5257 for branches/UserManagement

Timestamp:

01/08/11 14:39:29 (13 years ago)

Author:

mjesner

Message:

#1196

Location:

branches/UserManagement

Files:

• HeuristicLab.Authentication.sln (modified) (11 diffs)
• HeuristicLab.Authentication.suo (modified) (previous)
• HeuristicLab.Collections-3.3.dll (added)
• HeuristicLab.Common-3.3.dll (added)
• HeuristicLab.Common.Resources-3.3.dll (added)
• HeuristicLab.Core-3.3.dll (added)
• HeuristicLab.Services.Authentication.DataAccess/UserManagement.dbml (modified) (5 diffs)
• HeuristicLab.Services.Authentication.DataAccess/UserManagement.dbml.layout (modified) (7 diffs)
• HeuristicLab.Services.Authentication.DataAccess/UserManagement.designer.cs (modified) (16 diffs)
• HeuristicLab.Services.Authentication.DataTransfer/Application.cs (modified) (2 diffs)
• HeuristicLab.Services.Authentication.DataTransfer/AuthenticationItem.cs (modified) (1 diff)
• HeuristicLab.Services.Authentication.DataTransfer/HeuristicLab.Services.Authentication.DataTransfer.csproj (modified) (1 diff)
• HeuristicLab.Services.Authentication.DataTransfer/Role.cs (modified) (2 diffs)
• HeuristicLab.Services.Authentication.DataTransfer/User.cs (modified) (2 diffs)
• HeuristicLab.Services.Authentication.ServiceClients/AuthenticationClient.cs (modified) (2 diffs)
• HeuristicLab.Services.Authentication.ServiceClients/ClientFactory.cs (modified) (1 diff)
• HeuristicLab.Services.Authentication.ServiceClients/HeuristicLab.Services.Authentication.ServiceClient.csproj (modified) (2 diffs)
• HeuristicLab.Services.Authentication.ServiceClients/ServiceClients/Application.cs (modified) (1 diff)
• HeuristicLab.Services.Authentication.ServiceClients/ServiceClients/AuthenticationItem.cs (added)
• HeuristicLab.Services.Authentication.ServiceClients/ServiceClients/AuthenticationServiceClient.cs (modified) (1 diff)
• HeuristicLab.Services.Authentication.ServiceClients/ServiceClients/Role.cs (modified) (1 diff)
• HeuristicLab.Services.Authentication.ServiceClients/ServiceClients/User.cs (modified) (1 diff)
• HeuristicLab.Services.Authentication.ServiceClients/app.config (modified) (1 diff)
• HeuristicLab.Services.Authentication.TestClient (deleted)
• HeuristicLab.Services.Authentication.TestClient2/HeuristicLab.Services.Authentication.TestClient2.csproj (modified) (5 diffs)
• HeuristicLab.Services.Authentication.TestClient2/HeuristicLab.Services.Authentication.TestClient2.csproj.user (added)
• HeuristicLab.Services.Authentication.TestClient2/Program.cs (modified) (3 diffs)
• HeuristicLab.Services.Authentication.TestClient2/Properties/Resources.Designer.cs (added)
• HeuristicLab.Services.Authentication.TestClient2/Properties/Resources.resx (added)
• HeuristicLab.Services.Authentication.TestClient2/UserManagement.Designer.cs (modified) (3 diffs)
• HeuristicLab.Services.Authentication.TestClient2/UserManagement.cs (modified) (2 diffs)
• HeuristicLab.Services.Authentication.TestClient2/UserManagement.resx (modified) (2 diffs)
• HeuristicLab.Services.Authentication.TestClient2/app.config (modified) (1 diff)
• HeuristicLab.Services.Authentication/AuthenticationService.cs (modified) (2 diffs)
• HeuristicLab.Services.Authentication/Convert.cs (modified) (1 diff)
• HeuristicLab.Services.Authentication/Interfaces/IAuthenticationService.cs (modified) (2 diffs)

branches/UserManagement/HeuristicLab.Authentication.sln

@@ -19 +19 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Authentication", "HeuristicLab.Services.Authentication\HeuristicLab.Services.Authentication.csproj", "{0E7ADDD6-C7EA-45F6-A7ED-48041ABF1A87}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Collections-3.3", "HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj", "{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}"
+EndProject
 Global
   GlobalSection(TestCaseManagementSettings) = postSolution
@@ -26 +28 @@
     Debug|Any CPU = Debug|Any CPU
     Debug|Mixed Platforms = Debug|Mixed Platforms
+    Debug|x64 = Debug|x64
     Debug|x86 = Debug|x86
     Release|Any CPU = Release|Any CPU
     Release|Mixed Platforms = Release|Mixed Platforms
+    Release|x64 = Release|x64
     Release|x86 = Release|x86
   EndGlobalSection
@@ -36 +40 @@
     {8700A834-561F-44F0-86B4-F220245A6BC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     {8700A834-561F-44F0-86B4-F220245A6BC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+    {8700A834-561F-44F0-86B4-F220245A6BC8}.Debug|x64.ActiveCfg = Debug|Any CPU
     {8700A834-561F-44F0-86B4-F220245A6BC8}.Debug|x86.ActiveCfg = Debug|Any CPU
     {8700A834-561F-44F0-86B4-F220245A6BC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -41 +46 @@
     {8700A834-561F-44F0-86B4-F220245A6BC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     {8700A834-561F-44F0-86B4-F220245A6BC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+    {8700A834-561F-44F0-86B4-F220245A6BC8}.Release|x64.ActiveCfg = Release|Any CPU
     {8700A834-561F-44F0-86B4-F220245A6BC8}.Release|x86.ActiveCfg = Release|Any CPU
     {AC44BDF4-AED7-4445-9A99-57B3237DBE88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -46 +52 @@
     {AC44BDF4-AED7-4445-9A99-57B3237DBE88}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     {AC44BDF4-AED7-4445-9A99-57B3237DBE88}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+    {AC44BDF4-AED7-4445-9A99-57B3237DBE88}.Debug|x64.ActiveCfg = Debug|Any CPU
     {AC44BDF4-AED7-4445-9A99-57B3237DBE88}.Debug|x86.ActiveCfg = Debug|Any CPU
     {AC44BDF4-AED7-4445-9A99-57B3237DBE88}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -51 +58 @@
     {AC44BDF4-AED7-4445-9A99-57B3237DBE88}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     {AC44BDF4-AED7-4445-9A99-57B3237DBE88}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+    {AC44BDF4-AED7-4445-9A99-57B3237DBE88}.Release|x64.ActiveCfg = Release|Any CPU
     {AC44BDF4-AED7-4445-9A99-57B3237DBE88}.Release|x86.ActiveCfg = Release|Any CPU
     {EB40C828-D545-4DFE-9CE6-108FB03C6912}.Debug|Any CPU.ActiveCfg = Debug|x86
     {EB40C828-D545-4DFE-9CE6-108FB03C6912}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
     {EB40C828-D545-4DFE-9CE6-108FB03C6912}.Debug|Mixed Platforms.Build.0 = Debug|x86
+    {EB40C828-D545-4DFE-9CE6-108FB03C6912}.Debug|x64.ActiveCfg = Debug|x86
     {EB40C828-D545-4DFE-9CE6-108FB03C6912}.Debug|x86.ActiveCfg = Debug|x86
     {EB40C828-D545-4DFE-9CE6-108FB03C6912}.Debug|x86.Build.0 = Debug|x86
@@ -60 +69 @@
     {EB40C828-D545-4DFE-9CE6-108FB03C6912}.Release|Mixed Platforms.ActiveCfg = Release|x86
     {EB40C828-D545-4DFE-9CE6-108FB03C6912}.Release|Mixed Platforms.Build.0 = Release|x86
+    {EB40C828-D545-4DFE-9CE6-108FB03C6912}.Release|x64.ActiveCfg = Release|x86
     {EB40C828-D545-4DFE-9CE6-108FB03C6912}.Release|x86.ActiveCfg = Release|x86
     {EB40C828-D545-4DFE-9CE6-108FB03C6912}.Release|x86.Build.0 = Release|x86
@@ -66 +76 @@
     {8E698904-936D-4C7A-AB0D-6225778D2968}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     {8E698904-936D-4C7A-AB0D-6225778D2968}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+    {8E698904-936D-4C7A-AB0D-6225778D2968}.Debug|x64.ActiveCfg = Debug|Any CPU
     {8E698904-936D-4C7A-AB0D-6225778D2968}.Debug|x86.ActiveCfg = Debug|Any CPU
     {8E698904-936D-4C7A-AB0D-6225778D2968}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -71 +82 @@
     {8E698904-936D-4C7A-AB0D-6225778D2968}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     {8E698904-936D-4C7A-AB0D-6225778D2968}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+    {8E698904-936D-4C7A-AB0D-6225778D2968}.Release|x64.ActiveCfg = Release|Any CPU
     {8E698904-936D-4C7A-AB0D-6225778D2968}.Release|x86.ActiveCfg = Release|Any CPU
     {0E7ADDD6-C7EA-45F6-A7ED-48041ABF1A87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -76 +88 @@
     {0E7ADDD6-C7EA-45F6-A7ED-48041ABF1A87}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     {0E7ADDD6-C7EA-45F6-A7ED-48041ABF1A87}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+    {0E7ADDD6-C7EA-45F6-A7ED-48041ABF1A87}.Debug|x64.ActiveCfg = Debug|Any CPU
     {0E7ADDD6-C7EA-45F6-A7ED-48041ABF1A87}.Debug|x86.ActiveCfg = Debug|Any CPU
     {0E7ADDD6-C7EA-45F6-A7ED-48041ABF1A87}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -81 +94 @@
     {0E7ADDD6-C7EA-45F6-A7ED-48041ABF1A87}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     {0E7ADDD6-C7EA-45F6-A7ED-48041ABF1A87}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+    {0E7ADDD6-C7EA-45F6-A7ED-48041ABF1A87}.Release|x64.ActiveCfg = Release|Any CPU
     {0E7ADDD6-C7EA-45F6-A7ED-48041ABF1A87}.Release|x86.ActiveCfg = Release|Any CPU
+    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Debug|Mixed Platforms.Build.0 = Debug|x86
+    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Debug|x64.ActiveCfg = Debug|x64
+    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Debug|x64.Build.0 = Debug|x64
+    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Debug|x86.ActiveCfg = Debug|x86
+    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Debug|x86.Build.0 = Debug|x86
+    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Release|Any CPU.Build.0 = Release|Any CPU
+    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Release|Mixed Platforms.ActiveCfg = Release|x86
+    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Release|Mixed Platforms.Build.0 = Release|x86
+    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Release|x64.ActiveCfg = Release|x64
+    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Release|x64.Build.0 = Release|x64
+    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Release|x86.ActiveCfg = Release|x86
+    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

branches/UserManagement/HeuristicLab.Services.Authentication.DataAccess/UserManagement.dbml

@@ -8 +8 @@
       <Column Name="Description" Type="System.String" DbType="NVarChar(256)" CanBeNull="true" />
       <Association Name="aspnet_Application_aspnet_Membership" Member="aspnet_Memberships" ThisKey="ApplicationId" OtherKey="ApplicationId" Type="aspnet_Membership" />
-      <Association Name="aspnet_Application_aspnet_Path" Member="aspnet_Paths" ThisKey="ApplicationId" OtherKey="ApplicationId" Type="aspnet_Path" />
       <Association Name="aspnet_Application_aspnet_Role" Member="aspnet_Roles" ThisKey="ApplicationId" OtherKey="ApplicationId" Type="aspnet_Role" />
       <Association Name="aspnet_Application_aspnet_User" Member="aspnet_Users" ThisKey="ApplicationId" OtherKey="ApplicationId" Type="aspnet_User" />
@@ -40 +39 @@
     </Type>
   </Table>
-  <Table Name="dbo.aspnet_Paths" Member="aspnet_Paths">
-    <Type Name="aspnet_Path">
-      <Column Name="ApplicationId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
-      <Column Name="PathId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
-      <Column Name="Path" Type="System.String" DbType="NVarChar(256) NOT NULL" CanBeNull="false" />
-      <Column Name="LoweredPath" Type="System.String" DbType="NVarChar(256) NOT NULL" CanBeNull="false" />
-      <Association Name="aspnet_Path_aspnet_PersonalizationAllUser" Member="aspnet_PersonalizationAllUser" ThisKey="PathId" OtherKey="PathId" Type="aspnet_PersonalizationAllUser" Cardinality="One" />
-      <Association Name="aspnet_Path_aspnet_PersonalizationPerUser" Member="aspnet_PersonalizationPerUsers" ThisKey="PathId" OtherKey="PathId" Type="aspnet_PersonalizationPerUser" />
-      <Association Name="aspnet_Application_aspnet_Path" Member="aspnet_Application" ThisKey="ApplicationId" OtherKey="ApplicationId" Type="aspnet_Application" IsForeignKey="true" />
-    </Type>
-  </Table>
-  <Table Name="dbo.aspnet_PersonalizationAllUsers" Member="aspnet_PersonalizationAllUsers">
-    <Type Name="aspnet_PersonalizationAllUser">
-      <Column Name="PathId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
-      <Column Name="PageSettings" Type="System.Data.Linq.Binary" DbType="Image NOT NULL" CanBeNull="false" UpdateCheck="Never" />
-      <Column Name="LastUpdatedDate" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
-      <Association Name="aspnet_Path_aspnet_PersonalizationAllUser" Member="aspnet_Path" ThisKey="PathId" OtherKey="PathId" Type="aspnet_Path" IsForeignKey="true" />
-    </Type>
-  </Table>
-  <Table Name="dbo.aspnet_PersonalizationPerUser" Member="aspnet_PersonalizationPerUsers">
-    <Type Name="aspnet_PersonalizationPerUser">
-      <Column Name="Id" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
-      <Column Name="PathId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
-      <Column Name="UserId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
-      <Column Name="PageSettings" Type="System.Data.Linq.Binary" DbType="Image NOT NULL" CanBeNull="false" UpdateCheck="Never" />
-      <Column Name="LastUpdatedDate" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
-      <Association Name="aspnet_Path_aspnet_PersonalizationPerUser" Member="aspnet_Path" ThisKey="PathId" OtherKey="PathId" Type="aspnet_Path" IsForeignKey="true" />
-      <Association Name="aspnet_User_aspnet_PersonalizationPerUser" Member="aspnet_User" ThisKey="UserId" OtherKey="UserId" Type="aspnet_User" IsForeignKey="true" />
-    </Type>
-  </Table>
-  <Table Name="dbo.aspnet_Profile" Member="aspnet_Profiles">
-    <Type Name="aspnet_Profile">
-      <Column Name="UserId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
-      <Column Name="PropertyNames" Type="System.String" DbType="NText NOT NULL" CanBeNull="false" UpdateCheck="Never" />
-      <Column Name="PropertyValuesString" Type="System.String" DbType="NText NOT NULL" CanBeNull="false" UpdateCheck="Never" />
-      <Column Name="PropertyValuesBinary" Type="System.Data.Linq.Binary" DbType="Image NOT NULL" CanBeNull="false" UpdateCheck="Never" />
-      <Column Name="LastUpdatedDate" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
-      <Association Name="aspnet_User_aspnet_Profile" Member="aspnet_User" ThisKey="UserId" OtherKey="UserId" Type="aspnet_User" IsForeignKey="true" />
-    </Type>
-  </Table>
   <Table Name="dbo.aspnet_Roles" Member="aspnet_Roles">
     <Type Name="aspnet_Role">
@@ -89 +48 @@
       <Association Name="aspnet_Role_aspnet_UsersInRole" Member="aspnet_UsersInRoles" ThisKey="RoleId" OtherKey="RoleId" Type="aspnet_UsersInRole" />
       <Association Name="aspnet_Application_aspnet_Role" Member="aspnet_Application" ThisKey="ApplicationId" OtherKey="ApplicationId" Type="aspnet_Application" IsForeignKey="true" />
-    </Type>
-  </Table>
-  <Table Name="dbo.aspnet_SchemaVersions" Member="aspnet_SchemaVersions">
-    <Type Name="aspnet_SchemaVersion">
-      <Column Name="Feature" Type="System.String" DbType="NVarChar(128) NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
-      <Column Name="CompatibleSchemaVersion" Type="System.String" DbType="NVarChar(128) NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
-      <Column Name="IsCurrentVersion" Type="System.Boolean" DbType="Bit NOT NULL" CanBeNull="false" />
     </Type>
   </Table>
@@ -108 +60 @@
       <Column Name="LastActivityDate" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
       <Association Name="aspnet_User_aspnet_Membership" Member="aspnet_Membership" ThisKey="UserId" OtherKey="UserId" Type="aspnet_Membership" Cardinality="One" />
-      <Association Name="aspnet_User_aspnet_PersonalizationPerUser" Member="aspnet_PersonalizationPerUsers" ThisKey="UserId" OtherKey="UserId" Type="aspnet_PersonalizationPerUser" />
-      <Association Name="aspnet_User_aspnet_Profile" Member="aspnet_Profile" ThisKey="UserId" OtherKey="UserId" Type="aspnet_Profile" Cardinality="One" />
       <Association Name="aspnet_User_aspnet_UsersInRole" Member="aspnet_UsersInRoles" ThisKey="UserId" OtherKey="UserId" Type="aspnet_UsersInRole" />
       <Association Name="aspnet_Application_aspnet_User" Member="aspnet_Application" ThisKey="ApplicationId" OtherKey="ApplicationId" Type="aspnet_Application" IsForeignKey="true" />
@@ -122 +72 @@
     </Type>
   </Table>
-  <Table Name="dbo.aspnet_WebEvent_Events" Member="aspnet_WebEvent_Events">
-    <Type Name="aspnet_WebEvent_Event">
-      <Column Name="EventId" Type="System.String" DbType="Char(32) NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
-      <Column Name="EventTimeUtc" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
-      <Column Name="EventTime" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
-      <Column Name="EventType" Type="System.String" DbType="NVarChar(256) NOT NULL" CanBeNull="false" />
-      <Column Name="EventSequence" Type="System.Decimal" DbType="Decimal(19,0) NOT NULL" CanBeNull="false" />
-      <Column Name="EventOccurrence" Type="System.Decimal" DbType="Decimal(19,0) NOT NULL" CanBeNull="false" />
-      <Column Name="EventCode" Type="System.Int32" DbType="Int NOT NULL" CanBeNull="false" />
-      <Column Name="EventDetailCode" Type="System.Int32" DbType="Int NOT NULL" CanBeNull="false" />
-      <Column Name="Message" Type="System.String" DbType="NVarChar(1024)" CanBeNull="true" />
-      <Column Name="ApplicationPath" Type="System.String" DbType="NVarChar(256)" CanBeNull="true" />
-      <Column Name="ApplicationVirtualPath" Type="System.String" DbType="NVarChar(256)" CanBeNull="true" />
-      <Column Name="MachineName" Type="System.String" DbType="NVarChar(256) NOT NULL" CanBeNull="false" />
-      <Column Name="RequestUrl" Type="System.String" DbType="NVarChar(1024)" CanBeNull="true" />
-      <Column Name="ExceptionType" Type="System.String" DbType="NVarChar(256)" CanBeNull="true" />
-      <Column Name="Details" Type="System.String" DbType="NText" CanBeNull="true" UpdateCheck="Never" />
-    </Type>
-  </Table>
-  <Function Name="dbo.aspnet_Users_DeleteUser" Method="aspnet_Users_DeleteUser">
+  <Function Name="dbo.aspnet_Membership_ResetPassword" Method="aspnet_Membership_ResetPassword">
     <Parameter Name="ApplicationName" Parameter="applicationName" Type="System.String" DbType="NVarChar(256)" />
     <Parameter Name="UserName" Parameter="userName" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="TablesToDeleteFrom" Parameter="tablesToDeleteFrom" Type="System.Int32" DbType="Int" />
-    <Parameter Name="NumTablesDeletedFrom" Parameter="numTablesDeletedFrom" Type="System.Int32" DbType="Int" Direction="InOut" />
-    <Return Type="System.Int32" />
-  </Function>
-  <Function Name="dbo.aspnet_Users_CreateUser" Method="aspnet_Users_CreateUser">
-    <Parameter Name="ApplicationId" Parameter="applicationId" Type="System.Guid" DbType="UniqueIdentifier" />
-    <Parameter Name="UserName" Parameter="userName" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="IsUserAnonymous" Parameter="isUserAnonymous" Type="System.Boolean" DbType="Bit" />
-    <Parameter Name="LastActivityDate" Parameter="lastActivityDate" Type="System.DateTime" DbType="DateTime" />
-    <Parameter Name="UserId" Parameter="userId" Type="System.Guid" DbType="UniqueIdentifier" Direction="InOut" />
-    <Return Type="System.Int32" />
-  </Function>
-  <Function Name="dbo.aspnet_UsersInRoles_AddUsersToRoles" Method="aspnet_UsersInRoles_AddUsersToRoles">
-    <Parameter Name="ApplicationName" Parameter="applicationName" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="UserNames" Parameter="userNames" Type="System.String" DbType="NVarChar(4000)" />
-    <Parameter Name="RoleNames" Parameter="roleNames" Type="System.String" DbType="NVarChar(4000)" />
+    <Parameter Name="NewPassword" Parameter="newPassword" Type="System.String" DbType="NVarChar(128)" />
+    <Parameter Name="MaxInvalidPasswordAttempts" Parameter="maxInvalidPasswordAttempts" Type="System.Int32" DbType="Int" />
+    <Parameter Name="PasswordAttemptWindow" Parameter="passwordAttemptWindow" Type="System.Int32" DbType="Int" />
+    <Parameter Name="PasswordSalt" Parameter="passwordSalt" Type="System.String" DbType="NVarChar(128)" />
     <Parameter Name="CurrentTimeUtc" Parameter="currentTimeUtc" Type="System.DateTime" DbType="DateTime" />
-    <ElementType Name="aspnet_UsersInRoles_AddUsersToRolesResult">
-      <Column Name="Name" Type="System.String" DbType="NVarChar(256) NOT NULL" CanBeNull="false" />
-    </ElementType>
-  </Function>
-  <Function Name="dbo.aspnet_UsersInRoles_RemoveUsersFromRoles" Method="aspnet_UsersInRoles_RemoveUsersFromRoles">
-    <Parameter Name="ApplicationName" Parameter="applicationName" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="UserNames" Parameter="userNames" Type="System.String" DbType="NVarChar(4000)" />
-    <Parameter Name="RoleNames" Parameter="roleNames" Type="System.String" DbType="NVarChar(4000)" />
-    <ElementType Name="aspnet_UsersInRoles_RemoveUsersFromRolesResult">
-      <Column Name="" Member="Column1" Type="System.String" DbType="NVarChar(1) NOT NULL" CanBeNull="false" />
-      <Column Name="Name" Type="System.String" DbType="NVarChar(256) NOT NULL" CanBeNull="false" />
-    </ElementType>
-  </Function>
-  <Function Name="dbo.aspnet_UsersInRoles_IsUserInRole" Method="aspnet_UsersInRoles_IsUserInRole">
-    <Parameter Name="ApplicationName" Parameter="applicationName" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="UserName" Parameter="userName" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="RoleName" Parameter="roleName" Type="System.String" DbType="NVarChar(256)" />
-    <Return Type="System.Int32" />
-  </Function>
-  <Function Name="dbo.aspnet_UsersInRoles_GetUsersInRoles" Method="aspnet_UsersInRoles_GetUsersInRoles">
-    <Parameter Name="ApplicationName" Parameter="applicationName" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="RoleName" Parameter="roleName" Type="System.String" DbType="NVarChar(256)" />
-    <ElementType Name="aspnet_UsersInRoles_GetUsersInRolesResult">
-      <Column Name="UserName" Type="System.String" DbType="NVarChar(256) NOT NULL" CanBeNull="false" />
-    </ElementType>
-  </Function>
-  <Function Name="dbo.aspnet_UsersInRoles_GetRolesForUser" Method="aspnet_UsersInRoles_GetRolesForUser">
-    <Parameter Name="ApplicationName" Parameter="applicationName" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="UserName" Parameter="userName" Type="System.String" DbType="NVarChar(256)" />
-    <ElementType Name="aspnet_UsersInRoles_GetRolesForUserResult">
-      <Column Name="RoleName" Type="System.String" DbType="NVarChar(256) NOT NULL" CanBeNull="false" />
-    </ElementType>
-  </Function>
-  <Function Name="dbo.aspnet_UsersInRoles_FindUsersInRole" Method="aspnet_UsersInRoles_FindUsersInRole">
-    <Parameter Name="ApplicationName" Parameter="applicationName" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="RoleName" Parameter="roleName" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="UserNameToMatch" Parameter="userNameToMatch" Type="System.String" DbType="NVarChar(256)" />
-    <ElementType Name="aspnet_UsersInRoles_FindUsersInRoleResult">
-      <Column Name="UserName" Type="System.String" DbType="NVarChar(256) NOT NULL" CanBeNull="false" />
-    </ElementType>
-  </Function>
-  <Function Name="dbo.aspnet_Roles_CreateRole" Method="aspnet_Roles_CreateRole">
-    <Parameter Name="ApplicationName" Parameter="applicationName" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="RoleName" Parameter="roleName" Type="System.String" DbType="NVarChar(256)" />
-    <Return Type="System.Int32" />
-  </Function>
-  <Function Name="dbo.aspnet_Roles_DeleteRole" Method="aspnet_Roles_DeleteRole">
-    <Parameter Name="ApplicationName" Parameter="applicationName" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="RoleName" Parameter="roleName" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="DeleteOnlyIfRoleIsEmpty" Parameter="deleteOnlyIfRoleIsEmpty" Type="System.Boolean" DbType="Bit" />
-    <Return Type="System.Int32" />
-  </Function>
-  <Function Name="dbo.aspnet_Applications_CreateApplication" Method="aspnet_Applications_CreateApplication">
-    <Parameter Name="ApplicationName" Parameter="applicationName" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="ApplicationId" Parameter="applicationId" Type="System.Guid" DbType="UniqueIdentifier" Direction="InOut" />
-    <Return Type="System.Int32" />
-  </Function>
-  <Function Name="dbo.aspnet_Roles_RoleExists" Method="aspnet_Roles_RoleExists">
-    <Parameter Name="ApplicationName" Parameter="applicationName" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="RoleName" Parameter="roleName" Type="System.String" DbType="NVarChar(256)" />
-    <Return Type="System.Int32" />
-  </Function>
-  <Function Name="dbo.aspnet_Roles_GetAllRoles" Method="aspnet_Roles_GetAllRoles">
-    <Parameter Name="ApplicationName" Parameter="applicationName" Type="System.String" DbType="NVarChar(256)" />
-    <ElementType Name="aspnet_Roles_GetAllRolesResult">
-      <Column Name="RoleName" Type="System.String" DbType="NVarChar(256) NOT NULL" CanBeNull="false" />
-    </ElementType>
-  </Function>
-  <Function Name="dbo.aspnet_Membership_CreateUser" Method="aspnet_Membership_CreateUser">
-    <Parameter Name="ApplicationName" Parameter="applicationName" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="UserName" Parameter="userName" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="Password" Parameter="password" Type="System.String" DbType="NVarChar(128)" />
-    <Parameter Name="PasswordSalt" Parameter="passwordSalt" Type="System.String" DbType="NVarChar(128)" />
-    <Parameter Name="Email" Parameter="email" Type="System.String" DbType="NVarChar(256)" />
-    <Parameter Name="PasswordQuestion" Parameter="passwordQuestion" Type="System.String" DbType="NVarChar(256)" />
+    <Parameter Name="PasswordFormat" Parameter="passwordFormat" Type="System.Int32" DbType="Int" />
     <Parameter Name="PasswordAnswer" Parameter="passwordAnswer" Type="System.String" DbType="NVarChar(128)" />
-    <Parameter Name="IsApproved" Parameter="isApproved" Type="System.Boolean" DbType="Bit" />
-    <Parameter Name="CurrentTimeUtc" Parameter="currentTimeUtc" Type="System.DateTime" DbType="DateTime" />
-    <Parameter Name="CreateDate" Parameter="createDate" Type="System.DateTime" DbType="DateTime" />
-    <Parameter Name="UniqueEmail" Parameter="uniqueEmail" Type="System.Int32" DbType="Int" />
-    <Parameter Name="PasswordFormat" Parameter="passwordFormat" Type="System.Int32" DbType="Int" />
-    <Parameter Name="UserId" Parameter="userId" Type="System.Guid" DbType="UniqueIdentifier" Direction="InOut" />
     <Return Type="System.Int32" />
   </Function>

branches/UserManagement/HeuristicLab.Services.Authentication.DataAccess/UserManagement.dbml.layout

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ordesignerObjectsDiagram dslVersion="1.0.0.0" absoluteBounds="0, 0, 13.375, 11.75" name="UserManagement">
+<ordesignerObjectsDiagram dslVersion="1.0.0.0" absoluteBounds="0, 0, 11, 10.25" name="UserManagement">
   <DataContextMoniker Name="/UserManagementDataContext" />
   <nestedChildShapes>
-    <classShape Id="ec805621-974f-4416-9b33-1f52c9efaa02" absoluteBounds="1.875, 6, 2, 1.5785953776041666">
+    <classShape Id="ec805621-974f-4416-9b33-1f52c9efaa02" absoluteBounds="0.75, 5.125, 2, 1.4248478190104166">
       <DataClassMoniker Name="/UserManagementDataContext/aspnet_Application" />
       <nestedChildShapes>
-        <elementListCompartment Id="d2f5e07d-74d6-4c49-808d-d6ea4f17d8fc" absoluteBounds="1.8899999999999997, 6.46, 1.9700000000000002, 1.0185953776041665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="d2f5e07d-74d6-4c49-808d-d6ea4f17d8fc" absoluteBounds="0.76499999999999968, 5.585, 1.9700000000000002, 0.86484781901041663" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
-    <classShape Id="7dc71a3b-61f9-453c-8e9b-ebf950468436" absoluteBounds="4.625, 0.5, 2, 4.8477197265625">
+    <classShape Id="7dc71a3b-61f9-453c-8e9b-ebf950468436" absoluteBounds="6.25, 3.125, 2, 4.2187524414062487">
       <DataClassMoniker Name="/UserManagementDataContext/aspnet_Membership" />
       <nestedChildShapes>
-        <elementListCompartment Id="4245b681-0b9d-40fd-bda3-b6fc3aadf805" absoluteBounds="4.6400000000000006, 0.96, 1.9700000000000002, 4.2877197265625" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="4245b681-0b9d-40fd-bda3-b6fc3aadf805" absoluteBounds="6.2650000000000006, 3.585, 1.9700000000000002, 3.65875244140625" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(3.78125 : 6); (3.78125 : 2.56814697265625); (4.625 : 2.56814697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(2.75 : 6.14011881510417); (4.91666666666667 : 6.14011881510417 : JumpStart); (5.08333333333333 : 6.14011881510417 : JumpEnd); (6.25 : 6.14011881510417)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/UserManagementDataContext/aspnet_Application/aspnet_Application_aspnet_Membership" />
       <nodes>
@@ -22 +22 @@
       </nodes>
     </associationConnector>
-    <classShape Id="7343514d-b96d-43be-aac1-1642639dfda8" absoluteBounds="1.5, 3.125, 2, 1.5785953776041666">
-      <DataClassMoniker Name="/UserManagementDataContext/aspnet_Path" />
+    <classShape Id="833e2796-ac5a-4a62-b3a1-6cfd97c9a7b1" absoluteBounds="2.125, 8.25, 2, 1.5891951497395844">
+      <DataClassMoniker Name="/UserManagementDataContext/aspnet_Role" />
       <nestedChildShapes>
-        <elementListCompartment Id="0b555909-5553-437e-8fb3-d8bb04dd2960" absoluteBounds="1.5149999999999997, 3.585, 1.9700000000000002, 1.0185953776041665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="4ebc7fb9-2342-4359-950b-d59908adb887" absoluteBounds="2.1400000000000006, 8.71, 1.9700000000000002, 1.0291951497395833" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(2.6875 : 6); (2.6875 : 4.70359537760417)]" fixedFrom="NotFixed" fixedTo="NotFixed">
-      <AssociationMoniker Name="/UserManagementDataContext/aspnet_Application/aspnet_Application_aspnet_Path" />
-      <nodes>
-        <classShapeMoniker Id="ec805621-974f-4416-9b33-1f52c9efaa02" />
-        <classShapeMoniker Id="7343514d-b96d-43be-aac1-1642639dfda8" />
-      </nodes>
-    </associationConnector>
-    <classShape Id="3b521864-bc4c-4283-8733-af46ed4fe8a7" absoluteBounds="1.625, 0.625, 2, 1.3862939453125">
-      <DataClassMoniker Name="/UserManagementDataContext/aspnet_PersonalizationAllUser" />
-      <nestedChildShapes>
-        <elementListCompartment Id="508a8e64-87d9-40bc-8fdb-f1cf0f62124c" absoluteBounds="1.6400000000000001, 1.085, 1.9700000000000002, 0.8262939453125" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
-      </nestedChildShapes>
-    </classShape>
-    <associationConnector edgePoints="[(3.05292168109001 : 3.125); (3.05292168109001 : 2.0112939453125)]" fixedFrom="NotFixed" fixedTo="NotFixed">
-      <AssociationMoniker Name="/UserManagementDataContext/aspnet_Path/aspnet_Path_aspnet_PersonalizationAllUser" />
-      <nodes>
-        <classShapeMoniker Id="7343514d-b96d-43be-aac1-1642639dfda8" />
-        <classShapeMoniker Id="3b521864-bc4c-4283-8733-af46ed4fe8a7" />
-      </nodes>
-    </associationConnector>
-    <classShape Id="5013ff3a-8cce-4550-ac77-e9cee0ddc9ba" absoluteBounds="11.125, 1.75, 2, 1.7708968098958331">
-      <DataClassMoniker Name="/UserManagementDataContext/aspnet_PersonalizationPerUser" />
-      <nestedChildShapes>
-        <elementListCompartment Id="3c2e4362-9781-4d55-af9c-599ad3861a16" absoluteBounds="11.14, 2.21, 1.9700000000000002, 1.2108968098958333" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
-      </nestedChildShapes>
-    </classShape>
-    <associationConnector edgePoints="[(3.5 : 3.91429768880208); (4.375 : 3.91429768880208); (4.375 : 5.5977197265625); (7.875 : 5.5977197265625); (7.875 : 3.875); (12.39062575 : 3.875); (12.39062575 : 3.52089680989583)]" fixedFrom="NotFixed" fixedTo="NotFixed">
-      <AssociationMoniker Name="/UserManagementDataContext/aspnet_Path/aspnet_Path_aspnet_PersonalizationPerUser" />
-      <nodes>
-        <classShapeMoniker Id="7343514d-b96d-43be-aac1-1642639dfda8" />
-        <classShapeMoniker Id="5013ff3a-8cce-4550-ac77-e9cee0ddc9ba" />
-      </nodes>
-    </associationConnector>
-    <classShape Id="86d1546c-0a9b-4dd7-844e-6eb30600f1b2" absoluteBounds="8, 0.5, 2, 1.7708968098958331">
-      <DataClassMoniker Name="/UserManagementDataContext/aspnet_Profile" />
-      <nestedChildShapes>
-        <elementListCompartment Id="75b89f84-1a81-4940-8c47-c3935a3bc84d" absoluteBounds="8.015, 0.96, 1.9700000000000002, 1.2108968098958333" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
-      </nestedChildShapes>
-    </classShape>
-    <classShape Id="833e2796-ac5a-4a62-b3a1-6cfd97c9a7b1" absoluteBounds="3.625, 9, 2, 1.7708968098958331">
-      <DataClassMoniker Name="/UserManagementDataContext/aspnet_Role" />
-      <nestedChildShapes>
-        <elementListCompartment Id="4ebc7fb9-2342-4359-950b-d59908adb887" absoluteBounds="3.6400000000000006, 9.46, 1.9700000000000002, 1.2108968098958333" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
-      </nestedChildShapes>
-    </classShape>
-    <associationConnector edgePoints="[(2.7499995 : 7.57859537760417); (2.7499995 : 9.88544840494792); (3.625 : 9.88544840494792)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(2.4375 : 6.54984781901042); (2.4375 : 8.25)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/UserManagementDataContext/aspnet_Application/aspnet_Application_aspnet_Role" />
       <nodes>
@@ -80 +35 @@
       </nodes>
     </associationConnector>
-    <classShape Id="da1e6fa8-2149-42f4-a56c-f492cd62deb6" absoluteBounds="6.625, 10.125, 2, 1.3862939453125">
-      <DataClassMoniker Name="/UserManagementDataContext/aspnet_SchemaVersion" />
+    <classShape Id="6bceff2f-2d6b-4f24-b50d-2296ff7f62c3" absoluteBounds="3.5, 3.75, 2, 1.9178898111979166">
+      <DataClassMoniker Name="/UserManagementDataContext/aspnet_User" />
       <nestedChildShapes>
-        <elementListCompartment Id="7a2a020f-f4bb-490e-9a84-81f0f66b5e68" absoluteBounds="6.6400000000000006, 10.585, 1.9700000000000002, 0.8262939453125" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="bf2f1444-f051-4d39-9055-c21643a53875" absoluteBounds="3.5150000000000006, 4.2100000000000009, 1.9700000000000002, 1.3578898111979165" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
-    <classShape Id="6bceff2f-2d6b-4f24-b50d-2296ff7f62c3" absoluteBounds="8.125, 4.125, 2, 2.1554996744791666">
-      <DataClassMoniker Name="/UserManagementDataContext/aspnet_User" />
-      <nestedChildShapes>
-        <elementListCompartment Id="bf2f1444-f051-4d39-9055-c21643a53875" absoluteBounds="8.14, 4.5850000000000009, 1.9700000000000002, 1.5954996744791665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
-      </nestedChildShapes>
-    </classShape>
-    <associationConnector edgePoints="[(8.125 : 4.73635986328125); (6.625 : 4.73635986328125)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(5.5 : 4.70894490559896); (6.25 : 4.70894490559896)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/UserManagementDataContext/aspnet_User/aspnet_User_aspnet_Membership" />
       <nodes>
@@ -99 +48 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(10.125 : 5.20274983723958); (11.5937475 : 5.20274983723958); (11.5937475 : 3.52089680989583)]" fixedFrom="NotFixed" fixedTo="NotFixed">
-      <AssociationMoniker Name="/UserManagementDataContext/aspnet_User/aspnet_User_aspnet_PersonalizationPerUser" />
-      <nodes>
-        <classShapeMoniker Id="6bceff2f-2d6b-4f24-b50d-2296ff7f62c3" />
-        <classShapeMoniker Id="5013ff3a-8cce-4550-ac77-e9cee0ddc9ba" />
-      </nodes>
-    </associationConnector>
-    <associationConnector edgePoints="[(9.0625 : 4.125); (9.0625 : 2.27089680989583)]" fixedFrom="NotFixed" fixedTo="NotFixed">
-      <AssociationMoniker Name="/UserManagementDataContext/aspnet_User/aspnet_User_aspnet_Profile" />
-      <nodes>
-        <classShapeMoniker Id="6bceff2f-2d6b-4f24-b50d-2296ff7f62c3" />
-        <classShapeMoniker Id="86d1546c-0a9b-4dd7-844e-6eb30600f1b2" />
-      </nodes>
-    </associationConnector>
-    <associationConnector edgePoints="[(3.875 : 6.96080002604167); (9.2500025 : 6.96080002604167); (9.2500025 : 6.28049967447917)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(2.75 : 5.39644490559896); (3.5 : 5.39644490559896)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/UserManagementDataContext/aspnet_Application/aspnet_Application_aspnet_User" />
       <nodes>
@@ -120 +55 @@
       </nodes>
     </associationConnector>
-    <classShape Id="a25c9c99-735f-4294-aabd-ba04c3f98575" absoluteBounds="6.5, 8.25, 2, 1.1939925130208333">
+    <classShape Id="a25c9c99-735f-4294-aabd-ba04c3f98575" absoluteBounds="6.25, 8.875, 2, 1.0961531575520844">
       <DataClassMoniker Name="/UserManagementDataContext/aspnet_UsersInRole" />
       <nestedChildShapes>
-        <elementListCompartment Id="f223e83f-c7c9-4564-8465-9e039f273520" absoluteBounds="6.5150000000000006, 8.71, 1.9700000000000002, 0.63399251302083326" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="f223e83f-c7c9-4564-8465-9e039f273520" absoluteBounds="6.2650000000000006, 9.335, 1.9700000000000002, 0.53615315755208326" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(5.625 : 9.22199625651042); (6.5 : 9.22199625651042)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(4.125 : 9.5409904695638); (6.25 : 9.5409904695638)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/UserManagementDataContext/aspnet_Role/aspnet_Role_aspnet_UsersInRole" />
       <nodes>
@@ -133 +68 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(8.3125 : 6.28049967447917); (8.3125 : 8.25)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(5 : 5.66788981119792); (5 : 9.11778578938802); (6.25 : 9.11778578938802)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/UserManagementDataContext/aspnet_User/aspnet_User_aspnet_UsersInRole" />
       <nodes>
@@ -140 +75 @@
       </nodes>
     </associationConnector>
-    <classShape Id="c85c3936-32dd-417e-a0af-7a03fb14cc36" absoluteBounds="10.25, 7.375, 2, 3.6939111328124996">
-      <DataClassMoniker Name="/UserManagementDataContext/aspnet_WebEvent_Event" />
-      <nestedChildShapes>
-        <elementListCompartment Id="6a3d388c-ec23-47c6-a139-35716577f2d8" absoluteBounds="10.265, 7.8350000000000009, 1.9700000000000002, 3.1339111328125" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
-      </nestedChildShapes>
-    </classShape>
   </nestedChildShapes>
 </ordesignerObjectsDiagram>

branches/UserManagement/HeuristicLab.Services.Authentication.DataAccess/UserManagement.designer.cs

@@ -37 +37 @@
     partial void Updateaspnet_Membership(aspnet_Membership instance);
     partial void Deleteaspnet_Membership(aspnet_Membership instance);
-    partial void Insertaspnet_Path(aspnet_Path instance);
-    partial void Updateaspnet_Path(aspnet_Path instance);
-    partial void Deleteaspnet_Path(aspnet_Path instance);
-    partial void Insertaspnet_PersonalizationAllUser(aspnet_PersonalizationAllUser instance);
-    partial void Updateaspnet_PersonalizationAllUser(aspnet_PersonalizationAllUser instance);
-    partial void Deleteaspnet_PersonalizationAllUser(aspnet_PersonalizationAllUser instance);
-    partial void Insertaspnet_PersonalizationPerUser(aspnet_PersonalizationPerUser instance);
-    partial void Updateaspnet_PersonalizationPerUser(aspnet_PersonalizationPerUser instance);
-    partial void Deleteaspnet_PersonalizationPerUser(aspnet_PersonalizationPerUser instance);
-    partial void Insertaspnet_Profile(aspnet_Profile instance);
-    partial void Updateaspnet_Profile(aspnet_Profile instance);
-    partial void Deleteaspnet_Profile(aspnet_Profile instance);
     partial void Insertaspnet_Role(aspnet_Role instance);
     partial void Updateaspnet_Role(aspnet_Role instance);
     partial void Deleteaspnet_Role(aspnet_Role instance);
-    partial void Insertaspnet_SchemaVersion(aspnet_SchemaVersion instance);
-    partial void Updateaspnet_SchemaVersion(aspnet_SchemaVersion instance);
-    partial void Deleteaspnet_SchemaVersion(aspnet_SchemaVersion instance);
     partial void Insertaspnet_User(aspnet_User instance);
     partial void Updateaspnet_User(aspnet_User instance);
@@ -61 +46 @@
     partial void Updateaspnet_UsersInRole(aspnet_UsersInRole instance);
     partial void Deleteaspnet_UsersInRole(aspnet_UsersInRole instance);
-    partial void Insertaspnet_WebEvent_Event(aspnet_WebEvent_Event instance);
-    partial void Updateaspnet_WebEvent_Event(aspnet_WebEvent_Event instance);
-    partial void Deleteaspnet_WebEvent_Event(aspnet_WebEvent_Event instance);
     #endregion
     
@@ -112 +94 @@
     }
     
-    public System.Data.Linq.Table<aspnet_Path> aspnet_Paths
-    {
-      get
-      {
-        return this.GetTable<aspnet_Path>();
-      }
-    }
-    
-    public System.Data.Linq.Table<aspnet_PersonalizationAllUser> aspnet_PersonalizationAllUsers
-    {
-      get
-      {
-        return this.GetTable<aspnet_PersonalizationAllUser>();
-      }
-    }
-    
-    public System.Data.Linq.Table<aspnet_PersonalizationPerUser> aspnet_PersonalizationPerUsers
-    {
-      get
-      {
-        return this.GetTable<aspnet_PersonalizationPerUser>();
-      }
-    }
-    
-    public System.Data.Linq.Table<aspnet_Profile> aspnet_Profiles
-    {
-      get
-      {
-        return this.GetTable<aspnet_Profile>();
-      }
-    }
-    
     public System.Data.Linq.Table<aspnet_Role> aspnet_Roles
     {
@@ -152 +102 @@
     }
     
-    public System.Data.Linq.Table<aspnet_SchemaVersion> aspnet_SchemaVersions
-    {
-      get
-      {
-        return this.GetTable<aspnet_SchemaVersion>();
-      }
-    }
-    
     public System.Data.Linq.Table<aspnet_User> aspnet_Users
     {
@@ -176 +118 @@
     }
     
-    public System.Data.Linq.Table<aspnet_WebEvent_Event> aspnet_WebEvent_Events
-    {
-      get
-      {
-        return this.GetTable<aspnet_WebEvent_Event>();
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.FunctionAttribute(Name="dbo.aspnet_Users_DeleteUser")]
-    public int aspnet_Users_DeleteUser([global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationName", DbType="NVarChar(256)")] string applicationName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="UserName", DbType="NVarChar(256)")] string userName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="TablesToDeleteFrom", DbType="Int")] System.Nullable<int> tablesToDeleteFrom, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="NumTablesDeletedFrom", DbType="Int")] ref System.Nullable<int> numTablesDeletedFrom)
-    {
-      IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)(MethodInfo.GetCurrentMethod())), applicationName, userName, tablesToDeleteFrom, numTablesDeletedFrom);
-      numTablesDeletedFrom = ((System.Nullable<int>)(result.GetParameterValue(3)));
-      return ((int)(result.ReturnValue));
-    }
-    
-    [global::System.Data.Linq.Mapping.FunctionAttribute(Name="dbo.aspnet_Users_CreateUser")]
-    public int aspnet_Users_CreateUser([global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationId", DbType="UniqueIdentifier")] System.Nullable<System.Guid> applicationId, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="UserName", DbType="NVarChar(256)")] string userName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="IsUserAnonymous", DbType="Bit")] System.Nullable<bool> isUserAnonymous, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="LastActivityDate", DbType="DateTime")] System.Nullable<System.DateTime> lastActivityDate, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="UserId", DbType="UniqueIdentifier")] ref System.Nullable<System.Guid> userId)
-    {
-      IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)(MethodInfo.GetCurrentMethod())), applicationId, userName, isUserAnonymous, lastActivityDate, userId);
-      userId = ((System.Nullable<System.Guid>)(result.GetParameterValue(4)));
-      return ((int)(result.ReturnValue));
-    }
-    
-    [global::System.Data.Linq.Mapping.FunctionAttribute(Name="dbo.aspnet_UsersInRoles_AddUsersToRoles")]
-    public ISingleResult<aspnet_UsersInRoles_AddUsersToRolesResult> aspnet_UsersInRoles_AddUsersToRoles([global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationName", DbType="NVarChar(256)")] string applicationName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="UserNames", DbType="NVarChar(4000)")] string userNames, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="RoleNames", DbType="NVarChar(4000)")] string roleNames, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="CurrentTimeUtc", DbType="DateTime")] System.Nullable<System.DateTime> currentTimeUtc)
-    {
-      IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)(MethodInfo.GetCurrentMethod())), applicationName, userNames, roleNames, currentTimeUtc);
-      return ((ISingleResult<aspnet_UsersInRoles_AddUsersToRolesResult>)(result.ReturnValue));
-    }
-    
-    [global::System.Data.Linq.Mapping.FunctionAttribute(Name="dbo.aspnet_UsersInRoles_RemoveUsersFromRoles")]
-    public ISingleResult<aspnet_UsersInRoles_RemoveUsersFromRolesResult> aspnet_UsersInRoles_RemoveUsersFromRoles([global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationName", DbType="NVarChar(256)")] string applicationName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="UserNames", DbType="NVarChar(4000)")] string userNames, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="RoleNames", DbType="NVarChar(4000)")] string roleNames)
-    {
-      IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)(MethodInfo.GetCurrentMethod())), applicationName, userNames, roleNames);
-      return ((ISingleResult<aspnet_UsersInRoles_RemoveUsersFromRolesResult>)(result.ReturnValue));
-    }
-    
-    [global::System.Data.Linq.Mapping.FunctionAttribute(Name="dbo.aspnet_UsersInRoles_IsUserInRole")]
-    public int aspnet_UsersInRoles_IsUserInRole([global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationName", DbType="NVarChar(256)")] string applicationName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="UserName", DbType="NVarChar(256)")] string userName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="RoleName", DbType="NVarChar(256)")] string roleName)
-    {
-      IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)(MethodInfo.GetCurrentMethod())), applicationName, userName, roleName);
-      return ((int)(result.ReturnValue));
-    }
-    
-    [global::System.Data.Linq.Mapping.FunctionAttribute(Name="dbo.aspnet_UsersInRoles_GetUsersInRoles")]
-    public ISingleResult<aspnet_UsersInRoles_GetUsersInRolesResult> aspnet_UsersInRoles_GetUsersInRoles([global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationName", DbType="NVarChar(256)")] string applicationName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="RoleName", DbType="NVarChar(256)")] string roleName)
-    {
-      IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)(MethodInfo.GetCurrentMethod())), applicationName, roleName);
-      return ((ISingleResult<aspnet_UsersInRoles_GetUsersInRolesResult>)(result.ReturnValue));
-    }
-    
-    [global::System.Data.Linq.Mapping.FunctionAttribute(Name="dbo.aspnet_UsersInRoles_GetRolesForUser")]
-    public ISingleResult<aspnet_UsersInRoles_GetRolesForUserResult> aspnet_UsersInRoles_GetRolesForUser([global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationName", DbType="NVarChar(256)")] string applicationName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="UserName", DbType="NVarChar(256)")] string userName)
-    {
-      IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)(MethodInfo.GetCurrentMethod())), applicationName, userName);
-      return ((ISingleResult<aspnet_UsersInRoles_GetRolesForUserResult>)(result.ReturnValue));
-    }
-    
-    [global::System.Data.Linq.Mapping.FunctionAttribute(Name="dbo.aspnet_UsersInRoles_FindUsersInRole")]
-    public ISingleResult<aspnet_UsersInRoles_FindUsersInRoleResult> aspnet_UsersInRoles_FindUsersInRole([global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationName", DbType="NVarChar(256)")] string applicationName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="RoleName", DbType="NVarChar(256)")] string roleName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="UserNameToMatch", DbType="NVarChar(256)")] string userNameToMatch)
-    {
-      IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)(MethodInfo.GetCurrentMethod())), applicationName, roleName, userNameToMatch);
-      return ((ISingleResult<aspnet_UsersInRoles_FindUsersInRoleResult>)(result.ReturnValue));
-    }
-    
-    [global::System.Data.Linq.Mapping.FunctionAttribute(Name="dbo.aspnet_Roles_CreateRole")]
-    public int aspnet_Roles_CreateRole([global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationName", DbType="NVarChar(256)")] string applicationName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="RoleName", DbType="NVarChar(256)")] string roleName)
-    {
-      IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)(MethodInfo.GetCurrentMethod())), applicationName, roleName);
-      return ((int)(result.ReturnValue));
-    }
-    
-    [global::System.Data.Linq.Mapping.FunctionAttribute(Name="dbo.aspnet_Roles_DeleteRole")]
-    public int aspnet_Roles_DeleteRole([global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationName", DbType="NVarChar(256)")] string applicationName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="RoleName", DbType="NVarChar(256)")] string roleName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="DeleteOnlyIfRoleIsEmpty", DbType="Bit")] System.Nullable<bool> deleteOnlyIfRoleIsEmpty)
-    {
-      IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)(MethodInfo.GetCurrentMethod())), applicationName, roleName, deleteOnlyIfRoleIsEmpty);
-      return ((int)(result.ReturnValue));
-    }
-    
-    [global::System.Data.Linq.Mapping.FunctionAttribute(Name="dbo.aspnet_Applications_CreateApplication")]
-    public int aspnet_Applications_CreateApplication([global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationName", DbType="NVarChar(256)")] string applicationName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationId", DbType="UniqueIdentifier")] ref System.Nullable<System.Guid> applicationId)
-    {
-      IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)(MethodInfo.GetCurrentMethod())), applicationName, applicationId);
-      applicationId = ((System.Nullable<System.Guid>)(result.GetParameterValue(1)));
-      return ((int)(result.ReturnValue));
-    }
-    
-    [global::System.Data.Linq.Mapping.FunctionAttribute(Name="dbo.aspnet_Roles_RoleExists")]
-    public int aspnet_Roles_RoleExists([global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationName", DbType="NVarChar(256)")] string applicationName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="RoleName", DbType="NVarChar(256)")] string roleName)
-    {
-      IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)(MethodInfo.GetCurrentMethod())), applicationName, roleName);
-      return ((int)(result.ReturnValue));
-    }
-    
-    [global::System.Data.Linq.Mapping.FunctionAttribute(Name="dbo.aspnet_Roles_GetAllRoles")]
-    public ISingleResult<aspnet_Roles_GetAllRolesResult> aspnet_Roles_GetAllRoles([global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationName", DbType="NVarChar(256)")] string applicationName)
-    {
-      IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)(MethodInfo.GetCurrentMethod())), applicationName);
-      return ((ISingleResult<aspnet_Roles_GetAllRolesResult>)(result.ReturnValue));
-    }
-    
-    [global::System.Data.Linq.Mapping.FunctionAttribute(Name="dbo.aspnet_Membership_CreateUser")]
-    public int aspnet_Membership_CreateUser([global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationName", DbType="NVarChar(256)")] string applicationName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="UserName", DbType="NVarChar(256)")] string userName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="Password", DbType="NVarChar(128)")] string password, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="PasswordSalt", DbType="NVarChar(128)")] string passwordSalt, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="Email", DbType="NVarChar(256)")] string email, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="PasswordQuestion", DbType="NVarChar(256)")] string passwordQuestion, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="PasswordAnswer", DbType="NVarChar(128)")] string passwordAnswer, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="IsApproved", DbType="Bit")] System.Nullable<bool> isApproved, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="CurrentTimeUtc", DbType="DateTime")] System.Nullable<System.DateTime> currentTimeUtc, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="CreateDate", DbType="DateTime")] System.Nullable<System.DateTime> createDate, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="UniqueEmail", DbType="Int")] System.Nullable<int> uniqueEmail, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="PasswordFormat", DbType="Int")] System.Nullable<int> passwordFormat, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="UserId", DbType="UniqueIdentifier")] ref System.Nullable<System.Guid> userId)
-    {
-      IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)(MethodInfo.GetCurrentMethod())), applicationName, userName, password, passwordSalt, email, passwordQuestion, passwordAnswer, isApproved, currentTimeUtc, createDate, uniqueEmail, passwordFormat, userId);
-      userId = ((System.Nullable<System.Guid>)(result.GetParameterValue(12)));
+    [global::System.Data.Linq.Mapping.FunctionAttribute(Name="dbo.aspnet_Membership_ResetPassword")]
+    public int aspnet_Membership_ResetPassword([global::System.Data.Linq.Mapping.ParameterAttribute(Name="ApplicationName", DbType="NVarChar(256)")] string applicationName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="UserName", DbType="NVarChar(256)")] string userName, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="NewPassword", DbType="NVarChar(128)")] string newPassword, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="MaxInvalidPasswordAttempts", DbType="Int")] System.Nullable<int> maxInvalidPasswordAttempts, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="PasswordAttemptWindow", DbType="Int")] System.Nullable<int> passwordAttemptWindow, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="PasswordSalt", DbType="NVarChar(128)")] string passwordSalt, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="CurrentTimeUtc", DbType="DateTime")] System.Nullable<System.DateTime> currentTimeUtc, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="PasswordFormat", DbType="Int")] System.Nullable<int> passwordFormat, [global::System.Data.Linq.Mapping.ParameterAttribute(Name="PasswordAnswer", DbType="NVarChar(128)")] string passwordAnswer)
+    {
+      IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)(MethodInfo.GetCurrentMethod())), applicationName, userName, newPassword, maxInvalidPasswordAttempts, passwordAttemptWindow, passwordSalt, currentTimeUtc, passwordFormat, passwordAnswer);
       return ((int)(result.ReturnValue));
     }
@@ -302 +141 @@
     
     private EntitySet<aspnet_Membership> _aspnet_Memberships;
-    
-    private EntitySet<aspnet_Path> _aspnet_Paths;
     
     private EntitySet<aspnet_Role> _aspnet_Roles;
@@ -326 +163 @@
     {
       this._aspnet_Memberships = new EntitySet<aspnet_Membership>(new Action<aspnet_Membership>(this.attach_aspnet_Memberships), new Action<aspnet_Membership>(this.detach_aspnet_Memberships));
-      this._aspnet_Paths = new EntitySet<aspnet_Path>(new Action<aspnet_Path>(this.attach_aspnet_Paths), new Action<aspnet_Path>(this.detach_aspnet_Paths));
       this._aspnet_Roles = new EntitySet<aspnet_Role>(new Action<aspnet_Role>(this.attach_aspnet_Roles), new Action<aspnet_Role>(this.detach_aspnet_Roles));
       this._aspnet_Users = new EntitySet<aspnet_User>(new Action<aspnet_User>(this.attach_aspnet_Users), new Action<aspnet_User>(this.detach_aspnet_Users));
@@ -425 +261 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="aspnet_Application_aspnet_Path", Storage="_aspnet_Paths", ThisKey="ApplicationId", OtherKey="ApplicationId")]
-    public EntitySet<aspnet_Path> aspnet_Paths
-    {
-      get
-      {
-        return this._aspnet_Paths;
-      }
-      set
-      {
-        this._aspnet_Paths.Assign(value);
-      }
-    }
-    
     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="aspnet_Application_aspnet_Role", Storage="_aspnet_Roles", ThisKey="ApplicationId", OtherKey="ApplicationId")]
     public EntitySet<aspnet_Role> aspnet_Roles
@@ -491 +314 @@
     
     private void detach_aspnet_Memberships(aspnet_Membership entity)
-    {
-      this.SendPropertyChanging();
-      entity.aspnet_Application = null;
-    }
-    
-    private void attach_aspnet_Paths(aspnet_Path entity)
-    {
-      this.SendPropertyChanging();
-      entity.aspnet_Application = this;
-    }
-    
-    private void detach_aspnet_Paths(aspnet_Path entity)
     {
       this.SendPropertyChanging();
@@ -1157 +968 @@
   }
   
-  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.aspnet_Paths")]
-  public partial class aspnet_Path : INotifyPropertyChanging, INotifyPropertyChanged
-  {
-    
-    private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
-    
-    private System.Guid _ApplicationId;
-    
-    private System.Guid _PathId;
-    
-    private string _Path;
-    
-    private string _LoweredPath;
-    
-    private EntityRef<aspnet_PersonalizationAllUser> _aspnet_PersonalizationAllUser;
-    
-    private EntitySet<aspnet_PersonalizationPerUser> _aspnet_PersonalizationPerUsers;
-    
-    private EntityRef<aspnet_Application> _aspnet_Application;
-    
-    #region Extensibility Method Definitions
-    partial void OnLoaded();
-    partial void OnValidate(System.Data.Linq.ChangeAction action);
-    partial void OnCreated();
-    partial void OnApplicationIdChanging(System.Guid value);
-    partial void OnApplicationIdChanged();
-    partial void OnPathIdChanging(System.Guid value);
-    partial void OnPathIdChanged();
-    partial void OnPathChanging(string value);
-    partial void OnPathChanged();
-    partial void OnLoweredPathChanging(string value);
-    partial void OnLoweredPathChanged();
-    #endregion
-    
-    public aspnet_Path()
-    {
-      this._aspnet_PersonalizationAllUser = default(EntityRef<aspnet_PersonalizationAllUser>);
-      this._aspnet_PersonalizationPerUsers = new EntitySet<aspnet_PersonalizationPerUser>(new Action<aspnet_PersonalizationPerUser>(this.attach_aspnet_PersonalizationPerUsers), new Action<aspnet_PersonalizationPerUser>(this.detach_aspnet_PersonalizationPerUsers));
-      this._aspnet_Application = default(EntityRef<aspnet_Application>);
-      OnCreated();
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApplicationId", DbType="UniqueIdentifier NOT NULL")]
-    public System.Guid ApplicationId
-    {
-      get
-      {
-        return this._ApplicationId;
-      }
-      set
-      {
-        if ((this._ApplicationId != value))
-        {
-          if (this._aspnet_Application.HasLoadedOrAssignedValue)
-          {
-            throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
-          }
-          this.OnApplicationIdChanging(value);
-          this.SendPropertyChanging();
-          this._ApplicationId = value;
-          this.SendPropertyChanged("ApplicationId");
-          this.OnApplicationIdChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PathId", DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
-    public System.Guid PathId
-    {
-      get
-      {
-        return this._PathId;
-      }
-      set
-      {
-        if ((this._PathId != value))
-        {
-          this.OnPathIdChanging(value);
-          this.SendPropertyChanging();
-          this._PathId = value;
-          this.SendPropertyChanged("PathId");
-          this.OnPathIdChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Path", DbType="NVarChar(256) NOT NULL", CanBeNull=false)]
-    public string Path
-    {
-      get
-      {
-        return this._Path;
-      }
-      set
-      {
-        if ((this._Path != value))
-        {
-          this.OnPathChanging(value);
-          this.SendPropertyChanging();
-          this._Path = value;
-          this.SendPropertyChanged("Path");
-          this.OnPathChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LoweredPath", DbType="NVarChar(256) NOT NULL", CanBeNull=false)]
-    public string LoweredPath
-    {
-      get
-      {
-        return this._LoweredPath;
-      }
-      set
-      {
-        if ((this._LoweredPath != value))
-        {
-          this.OnLoweredPathChanging(value);
-          this.SendPropertyChanging();
-          this._LoweredPath = value;
-          this.SendPropertyChanged("LoweredPath");
-          this.OnLoweredPathChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="aspnet_Path_aspnet_PersonalizationAllUser", Storage="_aspnet_PersonalizationAllUser", ThisKey="PathId", OtherKey="PathId", IsUnique=true, IsForeignKey=false)]
-    public aspnet_PersonalizationAllUser aspnet_PersonalizationAllUser
-    {
-      get
-      {
-        return this._aspnet_PersonalizationAllUser.Entity;
-      }
-      set
-      {
-        aspnet_PersonalizationAllUser previousValue = this._aspnet_PersonalizationAllUser.Entity;
-        if (((previousValue != value) 
-              || (this._aspnet_PersonalizationAllUser.HasLoadedOrAssignedValue == false)))
-        {
-          this.SendPropertyChanging();
-          if ((previousValue != null))
-          {
-            this._aspnet_PersonalizationAllUser.Entity = null;
-            previousValue.aspnet_Path = null;
-          }
-          this._aspnet_PersonalizationAllUser.Entity = value;
-          if ((value != null))
-          {
-            value.aspnet_Path = this;
-          }
-          this.SendPropertyChanged("aspnet_PersonalizationAllUser");
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="aspnet_Path_aspnet_PersonalizationPerUser", Storage="_aspnet_PersonalizationPerUsers", ThisKey="PathId", OtherKey="PathId")]
-    public EntitySet<aspnet_PersonalizationPerUser> aspnet_PersonalizationPerUsers
-    {
-      get
-      {
-        return this._aspnet_PersonalizationPerUsers;
-      }
-      set
-      {
-        this._aspnet_PersonalizationPerUsers.Assign(value);
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="aspnet_Application_aspnet_Path", Storage="_aspnet_Application", ThisKey="ApplicationId", OtherKey="ApplicationId", IsForeignKey=true)]
-    public aspnet_Application aspnet_Application
-    {
-      get
-      {
-        return this._aspnet_Application.Entity;
-      }
-      set
-      {
-        aspnet_Application previousValue = this._aspnet_Application.Entity;
-        if (((previousValue != value) 
-              || (this._aspnet_Application.HasLoadedOrAssignedValue == false)))
-        {
-          this.SendPropertyChanging();
-          if ((previousValue != null))
-          {
-            this._aspnet_Application.Entity = null;
-            previousValue.aspnet_Paths.Remove(this);
-          }
-          this._aspnet_Application.Entity = value;
-          if ((value != null))
-          {
-            value.aspnet_Paths.Add(this);
-            this._ApplicationId = value.ApplicationId;
-          }
-          else
-          {
-            this._ApplicationId = default(System.Guid);
-          }
-          this.SendPropertyChanged("aspnet_Application");
-        }
-      }
-    }
-    
-    public event PropertyChangingEventHandler PropertyChanging;
-    
-    public event PropertyChangedEventHandler PropertyChanged;
-    
-    protected virtual void SendPropertyChanging()
-    {
-      if ((this.PropertyChanging != null))
-      {
-        this.PropertyChanging(this, emptyChangingEventArgs);
-      }
-    }
-    
-    protected virtual void SendPropertyChanged(String propertyName)
-    {
-      if ((this.PropertyChanged != null))
-      {
-        this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-      }
-    }
-    
-    private void attach_aspnet_PersonalizationPerUsers(aspnet_PersonalizationPerUser entity)
-    {
-      this.SendPropertyChanging();
-      entity.aspnet_Path = this;
-    }
-    
-    private void detach_aspnet_PersonalizationPerUsers(aspnet_PersonalizationPerUser entity)
-    {
-      this.SendPropertyChanging();
-      entity.aspnet_Path = null;
-    }
-  }
-  
-  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.aspnet_PersonalizationAllUsers")]
-  public partial class aspnet_PersonalizationAllUser : INotifyPropertyChanging, INotifyPropertyChanged
-  {
-    
-    private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
-    
-    private System.Guid _PathId;
-    
-    private System.Data.Linq.Binary _PageSettings;
-    
-    private System.DateTime _LastUpdatedDate;
-    
-    private EntityRef<aspnet_Path> _aspnet_Path;
-    
-    #region Extensibility Method Definitions
-    partial void OnLoaded();
-    partial void OnValidate(System.Data.Linq.ChangeAction action);
-    partial void OnCreated();
-    partial void OnPathIdChanging(System.Guid value);
-    partial void OnPathIdChanged();
-    partial void OnPageSettingsChanging(System.Data.Linq.Binary value);
-    partial void OnPageSettingsChanged();
-    partial void OnLastUpdatedDateChanging(System.DateTime value);
-    partial void OnLastUpdatedDateChanged();
-    #endregion
-    
-    public aspnet_PersonalizationAllUser()
-    {
-      this._aspnet_Path = default(EntityRef<aspnet_Path>);
-      OnCreated();
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PathId", DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
-    public System.Guid PathId
-    {
-      get
-      {
-        return this._PathId;
-      }
-      set
-      {
-        if ((this._PathId != value))
-        {
-          if (this._aspnet_Path.HasLoadedOrAssignedValue)
-          {
-            throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
-          }
-          this.OnPathIdChanging(value);
-          this.SendPropertyChanging();
-          this._PathId = value;
-          this.SendPropertyChanged("PathId");
-          this.OnPathIdChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PageSettings", DbType="Image NOT NULL", CanBeNull=false, UpdateCheck=UpdateCheck.Never)]
-    public System.Data.Linq.Binary PageSettings
-    {
-      get
-      {
-        return this._PageSettings;
-      }
-      set
-      {
-        if ((this._PageSettings != value))
-        {
-          this.OnPageSettingsChanging(value);
-          this.SendPropertyChanging();
-          this._PageSettings = value;
-          this.SendPropertyChanged("PageSettings");
-          this.OnPageSettingsChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LastUpdatedDate", DbType="DateTime NOT NULL")]
-    public System.DateTime LastUpdatedDate
-    {
-      get
-      {
-        return this._LastUpdatedDate;
-      }
-      set
-      {
-        if ((this._LastUpdatedDate != value))
-        {
-          this.OnLastUpdatedDateChanging(value);
-          this.SendPropertyChanging();
-          this._LastUpdatedDate = value;
-          this.SendPropertyChanged("LastUpdatedDate");
-          this.OnLastUpdatedDateChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="aspnet_Path_aspnet_PersonalizationAllUser", Storage="_aspnet_Path", ThisKey="PathId", OtherKey="PathId", IsForeignKey=true)]
-    public aspnet_Path aspnet_Path
-    {
-      get
-      {
-        return this._aspnet_Path.Entity;
-      }
-      set
-      {
-        aspnet_Path previousValue = this._aspnet_Path.Entity;
-        if (((previousValue != value) 
-              || (this._aspnet_Path.HasLoadedOrAssignedValue == false)))
-        {
-          this.SendPropertyChanging();
-          if ((previousValue != null))
-          {
-            this._aspnet_Path.Entity = null;
-            previousValue.aspnet_PersonalizationAllUser = null;
-          }
-          this._aspnet_Path.Entity = value;
-          if ((value != null))
-          {
-            value.aspnet_PersonalizationAllUser = this;
-            this._PathId = value.PathId;
-          }
-          else
-          {
-            this._PathId = default(System.Guid);
-          }
-          this.SendPropertyChanged("aspnet_Path");
-        }
-      }
-    }
-    
-    public event PropertyChangingEventHandler PropertyChanging;
-    
-    public event PropertyChangedEventHandler PropertyChanged;
-    
-    protected virtual void SendPropertyChanging()
-    {
-      if ((this.PropertyChanging != null))
-      {
-        this.PropertyChanging(this, emptyChangingEventArgs);
-      }
-    }
-    
-    protected virtual void SendPropertyChanged(String propertyName)
-    {
-      if ((this.PropertyChanged != null))
-      {
-        this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-      }
-    }
-  }
-  
-  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.aspnet_PersonalizationPerUser")]
-  public partial class aspnet_PersonalizationPerUser : INotifyPropertyChanging, INotifyPropertyChanged
-  {
-    
-    private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
-    
-    private System.Guid _Id;
-    
-    private System.Nullable<System.Guid> _PathId;
-    
-    private System.Nullable<System.Guid> _UserId;
-    
-    private System.Data.Linq.Binary _PageSettings;
-    
-    private System.DateTime _LastUpdatedDate;
-    
-    private EntityRef<aspnet_Path> _aspnet_Path;
-    
-    private EntityRef<aspnet_User> _aspnet_User;
-    
-    #region Extensibility Method Definitions
-    partial void OnLoaded();
-    partial void OnValidate(System.Data.Linq.ChangeAction action);
-    partial void OnCreated();
-    partial void OnIdChanging(System.Guid value);
-    partial void OnIdChanged();
-    partial void OnPathIdChanging(System.Nullable<System.Guid> value);
-    partial void OnPathIdChanged();
-    partial void OnUserIdChanging(System.Nullable<System.Guid> value);
-    partial void OnUserIdChanged();
-    partial void OnPageSettingsChanging(System.Data.Linq.Binary value);
-    partial void OnPageSettingsChanged();
-    partial void OnLastUpdatedDateChanging(System.DateTime value);
-    partial void OnLastUpdatedDateChanged();
-    #endregion
-    
-    public aspnet_PersonalizationPerUser()
-    {
-      this._aspnet_Path = default(EntityRef<aspnet_Path>);
-      this._aspnet_User = default(EntityRef<aspnet_User>);
-      OnCreated();
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
-    public System.Guid Id
-    {
-      get
-      {
-        return this._Id;
-      }
-      set
-      {
-        if ((this._Id != value))
-        {
-          this.OnIdChanging(value);
-          this.SendPropertyChanging();
-          this._Id = value;
-          this.SendPropertyChanged("Id");
-          this.OnIdChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PathId", DbType="UniqueIdentifier")]
-    public System.Nullable<System.Guid> PathId
-    {
-      get
-      {
-        return this._PathId;
-      }
-      set
-      {
-        if ((this._PathId != value))
-        {
-          if (this._aspnet_Path.HasLoadedOrAssignedValue)
-          {
-            throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
-          }
-          this.OnPathIdChanging(value);
-          this.SendPropertyChanging();
-          this._PathId = value;
-          this.SendPropertyChanged("PathId");
-          this.OnPathIdChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserId", DbType="UniqueIdentifier")]
-    public System.Nullable<System.Guid> UserId
-    {
-      get
-      {
-        return this._UserId;
-      }
-      set
-      {
-        if ((this._UserId != value))
-        {
-          if (this._aspnet_User.HasLoadedOrAssignedValue)
-          {
-            throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
-          }
-          this.OnUserIdChanging(value);
-          this.SendPropertyChanging();
-          this._UserId = value;
-          this.SendPropertyChanged("UserId");
-          this.OnUserIdChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PageSettings", DbType="Image NOT NULL", CanBeNull=false, UpdateCheck=UpdateCheck.Never)]
-    public System.Data.Linq.Binary PageSettings
-    {
-      get
-      {
-        return this._PageSettings;
-      }
-      set
-      {
-        if ((this._PageSettings != value))
-        {
-          this.OnPageSettingsChanging(value);
-          this.SendPropertyChanging();
-          this._PageSettings = value;
-          this.SendPropertyChanged("PageSettings");
-          this.OnPageSettingsChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LastUpdatedDate", DbType="DateTime NOT NULL")]
-    public System.DateTime LastUpdatedDate
-    {
-      get
-      {
-        return this._LastUpdatedDate;
-      }
-      set
-      {
-        if ((this._LastUpdatedDate != value))
-        {
-          this.OnLastUpdatedDateChanging(value);
-          this.SendPropertyChanging();
-          this._LastUpdatedDate = value;
-          this.SendPropertyChanged("LastUpdatedDate");
-          this.OnLastUpdatedDateChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="aspnet_Path_aspnet_PersonalizationPerUser", Storage="_aspnet_Path", ThisKey="PathId", OtherKey="PathId", IsForeignKey=true)]
-    public aspnet_Path aspnet_Path
-    {
-      get
-      {
-        return this._aspnet_Path.Entity;
-      }
-      set
-      {
-        aspnet_Path previousValue = this._aspnet_Path.Entity;
-        if (((previousValue != value) 
-              || (this._aspnet_Path.HasLoadedOrAssignedValue == false)))
-        {
-          this.SendPropertyChanging();
-          if ((previousValue != null))
-          {
-            this._aspnet_Path.Entity = null;
-            previousValue.aspnet_PersonalizationPerUsers.Remove(this);
-          }
-          this._aspnet_Path.Entity = value;
-          if ((value != null))
-          {
-            value.aspnet_PersonalizationPerUsers.Add(this);
-            this._PathId = value.PathId;
-          }
-          else
-          {
-            this._PathId = default(Nullable<System.Guid>);
-          }
-          this.SendPropertyChanged("aspnet_Path");
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="aspnet_User_aspnet_PersonalizationPerUser", Storage="_aspnet_User", ThisKey="UserId", OtherKey="UserId", IsForeignKey=true)]
-    public aspnet_User aspnet_User
-    {
-      get
-      {
-        return this._aspnet_User.Entity;
-      }
-      set
-      {
-        aspnet_User previousValue = this._aspnet_User.Entity;
-        if (((previousValue != value) 
-              || (this._aspnet_User.HasLoadedOrAssignedValue == false)))
-        {
-          this.SendPropertyChanging();
-          if ((previousValue != null))
-          {
-            this._aspnet_User.Entity = null;
-            previousValue.aspnet_PersonalizationPerUsers.Remove(this);
-          }
-          this._aspnet_User.Entity = value;
-          if ((value != null))
-          {
-            value.aspnet_PersonalizationPerUsers.Add(this);
-            this._UserId = value.UserId;
-          }
-          else
-          {
-            this._UserId = default(Nullable<System.Guid>);
-          }
-          this.SendPropertyChanged("aspnet_User");
-        }
-      }
-    }
-    
-    public event PropertyChangingEventHandler PropertyChanging;
-    
-    public event PropertyChangedEventHandler PropertyChanged;
-    
-    protected virtual void SendPropertyChanging()
-    {
-      if ((this.PropertyChanging != null))
-      {
-        this.PropertyChanging(this, emptyChangingEventArgs);
-      }
-    }
-    
-    protected virtual void SendPropertyChanged(String propertyName)
-    {
-      if ((this.PropertyChanged != null))
-      {
-        this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-      }
-    }
-  }
-  
-  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.aspnet_Profile")]
-  public partial class aspnet_Profile : INotifyPropertyChanging, INotifyPropertyChanged
-  {
-    
-    private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
-    
-    private System.Guid _UserId;
-    
-    private string _PropertyNames;
-    
-    private string _PropertyValuesString;
-    
-    private System.Data.Linq.Binary _PropertyValuesBinary;
-    
-    private System.DateTime _LastUpdatedDate;
-    
-    private EntityRef<aspnet_User> _aspnet_User;
-    
-    #region Extensibility Method Definitions
-    partial void OnLoaded();
-    partial void OnValidate(System.Data.Linq.ChangeAction action);
-    partial void OnCreated();
-    partial void OnUserIdChanging(System.Guid value);
-    partial void OnUserIdChanged();
-    partial void OnPropertyNamesChanging(string value);
-    partial void OnPropertyNamesChanged();
-    partial void OnPropertyValuesStringChanging(string value);
-    partial void OnPropertyValuesStringChanged();
-    partial void OnPropertyValuesBinaryChanging(System.Data.Linq.Binary value);
-    partial void OnPropertyValuesBinaryChanged();
-    partial void OnLastUpdatedDateChanging(System.DateTime value);
-    partial void OnLastUpdatedDateChanged();
-    #endregion
-    
-    public aspnet_Profile()
-    {
-      this._aspnet_User = default(EntityRef<aspnet_User>);
-      OnCreated();
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserId", DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
-    public System.Guid UserId
-    {
-      get
-      {
-        return this._UserId;
-      }
-      set
-      {
-        if ((this._UserId != value))
-        {
-          if (this._aspnet_User.HasLoadedOrAssignedValue)
-          {
-            throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
-          }
-          this.OnUserIdChanging(value);
-          this.SendPropertyChanging();
-          this._UserId = value;
-          this.SendPropertyChanged("UserId");
-          this.OnUserIdChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyNames", DbType="NText NOT NULL", CanBeNull=false, UpdateCheck=UpdateCheck.Never)]
-    public string PropertyNames
-    {
-      get
-      {
-        return this._PropertyNames;
-      }
-      set
-      {
-        if ((this._PropertyNames != value))
-        {
-          this.OnPropertyNamesChanging(value);
-          this.SendPropertyChanging();
-          this._PropertyNames = value;
-          this.SendPropertyChanged("PropertyNames");
-          this.OnPropertyNamesChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyValuesString", DbType="NText NOT NULL", CanBeNull=false, UpdateCheck=UpdateCheck.Never)]
-    public string PropertyValuesString
-    {
-      get
-      {
-        return this._PropertyValuesString;
-      }
-      set
-      {
-        if ((this._PropertyValuesString != value))
-        {
-          this.OnPropertyValuesStringChanging(value);
-          this.SendPropertyChanging();
-          this._PropertyValuesString = value;
-          this.SendPropertyChanged("PropertyValuesString");
-          this.OnPropertyValuesStringChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyValuesBinary", DbType="Image NOT NULL", CanBeNull=false, UpdateCheck=UpdateCheck.Never)]
-    public System.Data.Linq.Binary PropertyValuesBinary
-    {
-      get
-      {
-        return this._PropertyValuesBinary;
-      }
-      set
-      {
-        if ((this._PropertyValuesBinary != value))
-        {
-          this.OnPropertyValuesBinaryChanging(value);
-          this.SendPropertyChanging();
-          this._PropertyValuesBinary = value;
-          this.SendPropertyChanged("PropertyValuesBinary");
-          this.OnPropertyValuesBinaryChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LastUpdatedDate", DbType="DateTime NOT NULL")]
-    public System.DateTime LastUpdatedDate
-    {
-      get
-      {
-        return this._LastUpdatedDate;
-      }
-      set
-      {
-        if ((this._LastUpdatedDate != value))
-        {
-          this.OnLastUpdatedDateChanging(value);
-          this.SendPropertyChanging();
-          this._LastUpdatedDate = value;
-          this.SendPropertyChanged("LastUpdatedDate");
-          this.OnLastUpdatedDateChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="aspnet_User_aspnet_Profile", Storage="_aspnet_User", ThisKey="UserId", OtherKey="UserId", IsForeignKey=true)]
-    public aspnet_User aspnet_User
-    {
-      get
-      {
-        return this._aspnet_User.Entity;
-      }
-      set
-      {
-        aspnet_User previousValue = this._aspnet_User.Entity;
-        if (((previousValue != value) 
-              || (this._aspnet_User.HasLoadedOrAssignedValue == false)))
-        {
-          this.SendPropertyChanging();
-          if ((previousValue != null))
-          {
-            this._aspnet_User.Entity = null;
-            previousValue.aspnet_Profile = null;
-          }
-          this._aspnet_User.Entity = value;
-          if ((value != null))
-          {
-            value.aspnet_Profile = this;
-            this._UserId = value.UserId;
-          }
-          else
-          {
-            this._UserId = default(System.Guid);
-          }
-          this.SendPropertyChanged("aspnet_User");
-        }
-      }
-    }
-    
-    public event PropertyChangingEventHandler PropertyChanging;
-    
-    public event PropertyChangedEventHandler PropertyChanged;
-    
-    protected virtual void SendPropertyChanging()
-    {
-      if ((this.PropertyChanging != null))
-      {
-        this.PropertyChanging(this, emptyChangingEventArgs);
-      }
-    }
-    
-    protected virtual void SendPropertyChanged(String propertyName)
-    {
-      if ((this.PropertyChanged != null))
-      {
-        this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-      }
-    }
-  }
-  
   [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.aspnet_Roles")]
   public partial class aspnet_Role : INotifyPropertyChanging, INotifyPropertyChanged
@@ -2209 +1195 @@
   }
   
-  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.aspnet_SchemaVersions")]
-  public partial class aspnet_SchemaVersion : INotifyPropertyChanging, INotifyPropertyChanged
-  {
-    
-    private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
-    
-    private string _Feature;
-    
-    private string _CompatibleSchemaVersion;
-    
-    private bool _IsCurrentVersion;
-    
-    #region Extensibility Method Definitions
-    partial void OnLoaded();
-    partial void OnValidate(System.Data.Linq.ChangeAction action);
-    partial void OnCreated();
-    partial void OnFeatureChanging(string value);
-    partial void OnFeatureChanged();
-    partial void OnCompatibleSchemaVersionChanging(string value);
-    partial void OnCompatibleSchemaVersionChanged();
-    partial void OnIsCurrentVersionChanging(bool value);
-    partial void OnIsCurrentVersionChanged();
-    #endregion
-    
-    public aspnet_SchemaVersion()
-    {
-      OnCreated();
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Feature", DbType="NVarChar(128) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
-    public string Feature
-    {
-      get
-      {
-        return this._Feature;
-      }
-      set
-      {
-        if ((this._Feature != value))
-        {
-          this.OnFeatureChanging(value);
-          this.SendPropertyChanging();
-          this._Feature = value;
-          this.SendPropertyChanged("Feature");
-          this.OnFeatureChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompatibleSchemaVersion", DbType="NVarChar(128) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
-    public string CompatibleSchemaVersion
-    {
-      get
-      {
-        return this._CompatibleSchemaVersion;
-      }
-      set
-      {
-        if ((this._CompatibleSchemaVersion != value))
-        {
-          this.OnCompatibleSchemaVersionChanging(value);
-          this.SendPropertyChanging();
-          this._CompatibleSchemaVersion = value;
-          this.SendPropertyChanged("CompatibleSchemaVersion");
-          this.OnCompatibleSchemaVersionChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCurrentVersion", DbType="Bit NOT NULL")]
-    public bool IsCurrentVersion
-    {
-      get
-      {
-        return this._IsCurrentVersion;
-      }
-      set
-      {
-        if ((this._IsCurrentVersion != value))
-        {
-          this.OnIsCurrentVersionChanging(value);
-          this.SendPropertyChanging();
-          this._IsCurrentVersion = value;
-          this.SendPropertyChanged("IsCurrentVersion");
-          this.OnIsCurrentVersionChanged();
-        }
-      }
-    }
-    
-    public event PropertyChangingEventHandler PropertyChanging;
-    
-    public event PropertyChangedEventHandler PropertyChanged;
-    
-    protected virtual void SendPropertyChanging()
-    {
-      if ((this.PropertyChanging != null))
-      {
-        this.PropertyChanging(this, emptyChangingEventArgs);
-      }
-    }
-    
-    protected virtual void SendPropertyChanged(String propertyName)
-    {
-      if ((this.PropertyChanged != null))
-      {
-        this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-      }
-    }
-  }
-  
   [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.aspnet_Users")]
   public partial class aspnet_User : INotifyPropertyChanging, INotifyPropertyChanged
@@ -2340 +1216 @@
     
     private EntityRef<aspnet_Membership> _aspnet_Membership;
-    
-    private EntitySet<aspnet_PersonalizationPerUser> _aspnet_PersonalizationPerUsers;
-    
-    private EntityRef<aspnet_Profile> _aspnet_Profile;
     
     private EntitySet<aspnet_UsersInRole> _aspnet_UsersInRoles;
@@ -2372 +1244 @@
     {
       this._aspnet_Membership = default(EntityRef<aspnet_Membership>);
-      this._aspnet_PersonalizationPerUsers = new EntitySet<aspnet_PersonalizationPerUser>(new Action<aspnet_PersonalizationPerUser>(this.attach_aspnet_PersonalizationPerUsers), new Action<aspnet_PersonalizationPerUser>(this.detach_aspnet_PersonalizationPerUsers));
-      this._aspnet_Profile = default(EntityRef<aspnet_Profile>);
       this._aspnet_UsersInRoles = new EntitySet<aspnet_UsersInRole>(new Action<aspnet_UsersInRole>(this.attach_aspnet_UsersInRoles), new Action<aspnet_UsersInRole>(this.detach_aspnet_UsersInRoles));
       this._aspnet_Application = default(EntityRef<aspnet_Application>);
@@ -2552 +1422 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="aspnet_User_aspnet_PersonalizationPerUser", Storage="_aspnet_PersonalizationPerUsers", ThisKey="UserId", OtherKey="UserId")]
-    public EntitySet<aspnet_PersonalizationPerUser> aspnet_PersonalizationPerUsers
-    {
-      get
-      {
-        return this._aspnet_PersonalizationPerUsers;
-      }
-      set
-      {
-        this._aspnet_PersonalizationPerUsers.Assign(value);
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="aspnet_User_aspnet_Profile", Storage="_aspnet_Profile", ThisKey="UserId", OtherKey="UserId", IsUnique=true, IsForeignKey=false)]
-    public aspnet_Profile aspnet_Profile
-    {
-      get
-      {
-        return this._aspnet_Profile.Entity;
-      }
-      set
-      {
-        aspnet_Profile previousValue = this._aspnet_Profile.Entity;
-        if (((previousValue != value) 
-              || (this._aspnet_Profile.HasLoadedOrAssignedValue == false)))
-        {
-          this.SendPropertyChanging();
-          if ((previousValue != null))
-          {
-            this._aspnet_Profile.Entity = null;
-            previousValue.aspnet_User = null;
-          }
-          this._aspnet_Profile.Entity = value;
-          if ((value != null))
-          {
-            value.aspnet_User = this;
-          }
-          this.SendPropertyChanged("aspnet_Profile");
-        }
-      }
-    }
-    
     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="aspnet_User_aspnet_UsersInRole", Storage="_aspnet_UsersInRoles", ThisKey="UserId", OtherKey="UserId")]
     public EntitySet<aspnet_UsersInRole> aspnet_UsersInRoles
@@ -2659 +1487 @@
         this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
       }
-    }
-    
-    private void attach_aspnet_PersonalizationPerUsers(aspnet_PersonalizationPerUser entity)
-    {
-      this.SendPropertyChanging();
-      entity.aspnet_User = this;
-    }
-    
-    private void detach_aspnet_PersonalizationPerUsers(aspnet_PersonalizationPerUser entity)
-    {
-      this.SendPropertyChanging();
-      entity.aspnet_User = null;
     }
     
@@ -2853 +1669 @@
     }
   }
-  
-  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.aspnet_WebEvent_Events")]
-  public partial class aspnet_WebEvent_Event : INotifyPropertyChanging, INotifyPropertyChanged
-  {
-    
-    private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
-    
-    private string _EventId;
-    
-    private System.DateTime _EventTimeUtc;
-    
-    private System.DateTime _EventTime;
-    
-    private string _EventType;
-    
-    private decimal _EventSequence;
-    
-    private decimal _EventOccurrence;
-    
-    private int _EventCode;
-    
-    private int _EventDetailCode;
-    
-    private string _Message;
-    
-    private string _ApplicationPath;
-    
-    private string _ApplicationVirtualPath;
-    
-    private string _MachineName;
-    
-    private string _RequestUrl;
-    
-    private string _ExceptionType;
-    
-    private string _Details;
-    
-    #region Extensibility Method Definitions
-    partial void OnLoaded();
-    partial void OnValidate(System.Data.Linq.ChangeAction action);
-    partial void OnCreated();
-    partial void OnEventIdChanging(string value);
-    partial void OnEventIdChanged();
-    partial void OnEventTimeUtcChanging(System.DateTime value);
-    partial void OnEventTimeUtcChanged();
-    partial void OnEventTimeChanging(System.DateTime value);
-    partial void OnEventTimeChanged();
-    partial void OnEventTypeChanging(string value);
-    partial void OnEventTypeChanged();
-    partial void OnEventSequenceChanging(decimal value);
-    partial void OnEventSequenceChanged();
-    partial void OnEventOccurrenceChanging(decimal value);
-    partial void OnEventOccurrenceChanged();
-    partial void OnEventCodeChanging(int value);
-    partial void OnEventCodeChanged();
-    partial void OnEventDetailCodeChanging(int value);
-    partial void OnEventDetailCodeChanged();
-    partial void OnMessageChanging(string value);
-    partial void OnMessageChanged();
-    partial void OnApplicationPathChanging(string value);
-    partial void OnApplicationPathChanged();
-    partial void OnApplicationVirtualPathChanging(string value);
-    partial void OnApplicationVirtualPathChanged();
-    partial void OnMachineNameChanging(string value);
-    partial void OnMachineNameChanged();
-    partial void OnRequestUrlChanging(string value);
-    partial void OnRequestUrlChanged();
-    partial void OnExceptionTypeChanging(string value);
-    partial void OnExceptionTypeChanged();
-    partial void OnDetailsChanging(string value);
-    partial void OnDetailsChanged();
-    #endregion
-    
-    public aspnet_WebEvent_Event()
-    {
-      OnCreated();
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EventId", DbType="Char(32) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
-    public string EventId
-    {
-      get
-      {
-        return this._EventId;
-      }
-      set
-      {
-        if ((this._EventId != value))
-        {
-          this.OnEventIdChanging(value);
-          this.SendPropertyChanging();
-          this._EventId = value;
-          this.SendPropertyChanged("EventId");
-          this.OnEventIdChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EventTimeUtc", DbType="DateTime NOT NULL")]
-    public System.DateTime EventTimeUtc
-    {
-      get
-      {
-        return this._EventTimeUtc;
-      }
-      set
-      {
-        if ((this._EventTimeUtc != value))
-        {
-          this.OnEventTimeUtcChanging(value);
-          this.SendPropertyChanging();
-          this._EventTimeUtc = value;
-          this.SendPropertyChanged("EventTimeUtc");
-          this.OnEventTimeUtcChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EventTime", DbType="DateTime NOT NULL")]
-    public System.DateTime EventTime
-    {
-      get
-      {
-        return this._EventTime;
-      }
-      set
-      {
-        if ((this._EventTime != value))
-        {
-          this.OnEventTimeChanging(value);
-          this.SendPropertyChanging();
-          this._EventTime = value;
-          this.SendPropertyChanged("EventTime");
-          this.OnEventTimeChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EventType", DbType="NVarChar(256) NOT NULL", CanBeNull=false)]
-    public string EventType
-    {
-      get
-      {
-        return this._EventType;
-      }
-      set
-      {
-        if ((this._EventType != value))
-        {
-          this.OnEventTypeChanging(value);
-          this.SendPropertyChanging();
-          this._EventType = value;
-          this.SendPropertyChanged("EventType");
-          this.OnEventTypeChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EventSequence", DbType="Decimal(19,0) NOT NULL")]
-    public decimal EventSequence
-    {
-      get
-      {
-        return this._EventSequence;
-      }
-      set
-      {
-        if ((this._EventSequence != value))
-        {
-          this.OnEventSequenceChanging(value);
-          this.SendPropertyChanging();
-          this._EventSequence = value;
-          this.SendPropertyChanged("EventSequence");
-          this.OnEventSequenceChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EventOccurrence", DbType="Decimal(19,0) NOT NULL")]
-    public decimal EventOccurrence
-    {
-      get
-      {
-        return this._EventOccurrence;
-      }
-      set
-      {
-        if ((this._EventOccurrence != value))
-        {
-          this.OnEventOccurrenceChanging(value);
-          this.SendPropertyChanging();
-          this._EventOccurrence = value;
-          this.SendPropertyChanged("EventOccurrence");
-          this.OnEventOccurrenceChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EventCode", DbType="Int NOT NULL")]
-    public int EventCode
-    {
-      get
-      {
-        return this._EventCode;
-      }
-      set
-      {
-        if ((this._EventCode != value))
-        {
-          this.OnEventCodeChanging(value);
-          this.SendPropertyChanging();
-          this._EventCode = value;
-          this.SendPropertyChanged("EventCode");
-          this.OnEventCodeChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EventDetailCode", DbType="Int NOT NULL")]
-    public int EventDetailCode
-    {
-      get
-      {
-        return this._EventDetailCode;
-      }
-      set
-      {
-        if ((this._EventDetailCode != value))
-        {
-          this.OnEventDetailCodeChanging(value);
-          this.SendPropertyChanging();
-          this._EventDetailCode = value;
-          this.SendPropertyChanged("EventDetailCode");
-          this.OnEventDetailCodeChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Message", DbType="NVarChar(1024)")]
-    public string Message
-    {
-      get
-      {
-        return this._Message;
-      }
-      set
-      {
-        if ((this._Message != value))
-        {
-          this.OnMessageChanging(value);
-          this.SendPropertyChanging();
-          this._Message = value;
-          this.SendPropertyChanged("Message");
-          this.OnMessageChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApplicationPath", DbType="NVarChar(256)")]
-    public string ApplicationPath
-    {
-      get
-      {
-        return this._ApplicationPath;
-      }
-      set
-      {
-        if ((this._ApplicationPath != value))
-        {
-          this.OnApplicationPathChanging(value);
-          this.SendPropertyChanging();
-          this._ApplicationPath = value;
-          this.SendPropertyChanged("ApplicationPath");
-          this.OnApplicationPathChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApplicationVirtualPath", DbType="NVarChar(256)")]
-    public string ApplicationVirtualPath
-    {
-      get
-      {
-        return this._ApplicationVirtualPath;
-      }
-      set
-      {
-        if ((this._ApplicationVirtualPath != value))
-        {
-          this.OnApplicationVirtualPathChanging(value);
-          this.SendPropertyChanging();
-          this._ApplicationVirtualPath = value;
-          this.SendPropertyChanged("ApplicationVirtualPath");
-          this.OnApplicationVirtualPathChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MachineName", DbType="NVarChar(256) NOT NULL", CanBeNull=false)]
-    public string MachineName
-    {
-      get
-      {
-        return this._MachineName;
-      }
-      set
-      {
-        if ((this._MachineName != value))
-        {
-          this.OnMachineNameChanging(value);
-          this.SendPropertyChanging();
-          this._MachineName = value;
-          this.SendPropertyChanged("MachineName");
-          this.OnMachineNameChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RequestUrl", DbType="NVarChar(1024)")]
-    public string RequestUrl
-    {
-      get
-      {
-        return this._RequestUrl;
-      }
-      set
-      {
-        if ((this._RequestUrl != value))
-        {
-          this.OnRequestUrlChanging(value);
-          this.SendPropertyChanging();
-          this._RequestUrl = value;
-          this.SendPropertyChanged("RequestUrl");
-          this.OnRequestUrlChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ExceptionType", DbType="NVarChar(256)")]
-    public string ExceptionType
-    {
-      get
-      {
-        return this._ExceptionType;
-      }
-      set
-      {
-        if ((this._ExceptionType != value))
-        {
-          this.OnExceptionTypeChanging(value);
-          this.SendPropertyChanging();
-          this._ExceptionType = value;
-          this.SendPropertyChanged("ExceptionType");
-          this.OnExceptionTypeChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Details", DbType="NText", UpdateCheck=UpdateCheck.Never)]
-    public string Details
-    {
-      get
-      {
-        return this._Details;
-      }
-      set
-      {
-        if ((this._Details != value))
-        {
-          this.OnDetailsChanging(value);
-          this.SendPropertyChanging();
-          this._Details = value;
-          this.SendPropertyChanged("Details");
-          this.OnDetailsChanged();
-        }
-      }
-    }
-    
-    public event PropertyChangingEventHandler PropertyChanging;
-    
-    public event PropertyChangedEventHandler PropertyChanged;
-    
-    protected virtual void SendPropertyChanging()
-    {
-      if ((this.PropertyChanging != null))
-      {
-        this.PropertyChanging(this, emptyChangingEventArgs);
-      }
-    }
-    
-    protected virtual void SendPropertyChanged(String propertyName)
-    {
-      if ((this.PropertyChanged != null))
-      {
-        this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-      }
-    }
-  }
-  
-  public partial class aspnet_UsersInRoles_AddUsersToRolesResult
-  {
-    
-    private string _Name;
-    
-    public aspnet_UsersInRoles_AddUsersToRolesResult()
-    {
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(256) NOT NULL", CanBeNull=false)]
-    public string Name
-    {
-      get
-      {
-        return this._Name;
-      }
-      set
-      {
-        if ((this._Name != value))
-        {
-          this._Name = value;
-        }
-      }
-    }
-  }
-  
-  public partial class aspnet_UsersInRoles_RemoveUsersFromRolesResult
-  {
-    
-    private string _Column1;
-    
-    private string _Name;
-    
-    public aspnet_UsersInRoles_RemoveUsersFromRolesResult()
-    {
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Name="", Storage="_Column1", DbType="NVarChar(1) NOT NULL", CanBeNull=false)]
-    public string Column1
-    {
-      get
-      {
-        return this._Column1;
-      }
-      set
-      {
-        if ((this._Column1 != value))
-        {
-          this._Column1 = value;
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(256) NOT NULL", CanBeNull=false)]
-    public string Name
-    {
-      get
-      {
-        return this._Name;
-      }
-      set
-      {
-        if ((this._Name != value))
-        {
-          this._Name = value;
-        }
-      }
-    }
-  }
-  
-  public partial class aspnet_UsersInRoles_GetUsersInRolesResult
-  {
-    
-    private string _UserName;
-    
-    public aspnet_UsersInRoles_GetUsersInRolesResult()
-    {
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserName", DbType="NVarChar(256) NOT NULL", CanBeNull=false)]
-    public string UserName
-    {
-      get
-      {
-        return this._UserName;
-      }
-      set
-      {
-        if ((this._UserName != value))
-        {
-          this._UserName = value;
-        }
-      }
-    }
-  }
-  
-  public partial class aspnet_UsersInRoles_GetRolesForUserResult
-  {
-    
-    private string _RoleName;
-    
-    public aspnet_UsersInRoles_GetRolesForUserResult()
-    {
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RoleName", DbType="NVarChar(256) NOT NULL", CanBeNull=false)]
-    public string RoleName
-    {
-      get
-      {
-        return this._RoleName;
-      }
-      set
-      {
-        if ((this._RoleName != value))
-        {
-          this._RoleName = value;
-        }
-      }
-    }
-  }
-  
-  public partial class aspnet_UsersInRoles_FindUsersInRoleResult
-  {
-    
-    private string _UserName;
-    
-    public aspnet_UsersInRoles_FindUsersInRoleResult()
-    {
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserName", DbType="NVarChar(256) NOT NULL", CanBeNull=false)]
-    public string UserName
-    {
-      get
-      {
-        return this._UserName;
-      }
-      set
-      {
-        if ((this._UserName != value))
-        {
-          this._UserName = value;
-        }
-      }
-    }
-  }
-  
-  public partial class aspnet_Roles_GetAllRolesResult
-  {
-    
-    private string _RoleName;
-    
-    public aspnet_Roles_GetAllRolesResult()
-    {
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RoleName", DbType="NVarChar(256) NOT NULL", CanBeNull=false)]
-    public string RoleName
-    {
-      get
-      {
-        return this._RoleName;
-      }
-      set
-      {
-        if ((this._RoleName != value))
-        {
-          this._RoleName = value;
-        }
-      }
-    }
-  }
 }
 #pragma warning restore 1591

branches/UserManagement/HeuristicLab.Services.Authentication.DataTransfer/Application.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab 
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * 
+ * This file is part of HeuristicLab. 
+ * 
+ * HeuristicLab is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * HeuristicLab is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 
+ */
+#endregion
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -5 +25 @@
 using System.Runtime.Serialization;
 
-namespace HeuristicLab.Services.Authentication.DataTransfer
-{
+namespace HeuristicLab.Services.Authentication.DataTransfer {
+
   [DataContract]
-  public class Application : NamedAuthenticationItem {
-    
-    
-    
-    //[DataMember]
-    //public string LoweredApplicationName { get; set; } // !!! REMOVE
+  public class Application : AuthenticationItem {
+  }
 
-    [DataMember]
-    public string Description { get; set; }
-
-  }
-    //[DataContract]
-    //public class Application : NamedAuthItem {
-    //    [DataMember]
-    //    public Guid ApplicationId { get; set; }
-    //    [DataMember]
-    //    public string ApplicationName { get; set; }
-    //    [DataMember]
-    //    public string LoweredApplicationName { get; set; }
-    //    [DataMember]
-    //    public string Description { get; set; }
-    //}
 }

branches/UserManagement/HeuristicLab.Services.Authentication.DataTransfer/AuthenticationItem.cs

@@ -1 @@
-using System.Runtime.Serialization;
+#region License Information
+/* HeuristicLab 
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * 
+ * This file is part of HeuristicLab. 
+ * 
+ * HeuristicLab is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * HeuristicLab is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 
+ */
+#endregion
+using System.Runtime.Serialization;
 
-namespace HeuristicLab.Services.Authentication.DataTransfer
-{
+namespace HeuristicLab.Services.Authentication.DataTransfer {
+
   [DataContract]
-  public abstract class AuthenticationItem{
-
+  public abstract class AuthenticationItem {
 
     [DataMember]
     public System.Guid Id { get; set; }
+
+    [DataMember]
+    public string Name { get; set; }
+
+    [DataMember]
+    public string Description { get; set; }
   }
 }

branches/UserManagement/HeuristicLab.Services.Authentication.DataTransfer/HeuristicLab.Services.Authentication.DataTransfer.csproj

@@ -44 +44 @@
     <Compile Include="Application.cs" />
     <Compile Include="AuthenticationItem.cs" />
-    <Compile Include="NamedAuthenticationItem.cs" />
     <Compile Include="Role.cs" />
     <Compile Include="User.cs" />

branches/UserManagement/HeuristicLab.Services.Authentication.DataTransfer/Role.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab 
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * 
+ * This file is part of HeuristicLab. 
+ * 
+ * HeuristicLab is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * HeuristicLab is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 
+ */
+#endregion
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -5 +25 @@
 using System.Runtime.Serialization;
 
-namespace HeuristicLab.Services.Authentication.DataTransfer
-{
+namespace HeuristicLab.Services.Authentication.DataTransfer {
+
   [DataContract]
-  public class Role : NamedAuthenticationItem {
+  public class Role : AuthenticationItem {
 
-      public Role()
-      {
-          Name = "";
-      }
+    public Role() {
+      ApplicationId = Guid.Empty;
+    }
 
     [DataMember]
     public Guid ApplicationId { get; set; }
-    //[DataMember]
-    //public string LoweredRoleName { get; set; } // !!! REMOVE
-    [DataMember]
-    public string Description { get; set; }
   }
-    //[DataContract]
-    //public class Role
-    //{
-    //    [DataMember]
-    //    public Guid ApplicationId { get; set; }
-    //    [DataMember]
-    //    public Guid RoleId { get; set; }
-    //    [DataMember]
-    //    public string RoleName { get; set; }
-        //[DataMember]
-        //public string LoweredRoleName { get; set; }
-    //    [DataMember]
-    //    public string Description { get; set; }
-    //}
 }

branches/UserManagement/HeuristicLab.Services.Authentication.DataTransfer/User.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab 
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * 
+ * This file is part of HeuristicLab. 
+ * 
+ * HeuristicLab is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * HeuristicLab is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 
+ */
+#endregion
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -5 +25 @@
 using System.Runtime.Serialization;
 
-namespace HeuristicLab.Services.Authentication.DataTransfer
-{
+namespace HeuristicLab.Services.Authentication.DataTransfer {
+
   [DataContract]
-  public class User : NamedAuthenticationItem {
+  public class User : AuthenticationItem {
 
-      public User()
-      {
-          Password = "";
-          PasswordSalt = "";
-          Name = "";
-          CreateDate = DateTime.Now;
-          LastActivityDate = DateTime.Now;
-          LastLoginDate = DateTime.Now;
-          LastLockoutDate = DateTime.Now;
-          LastPasswordChangeDate = DateTime.Now;
-      }
+    public User() {
+      Name = string.Empty;
+      Email = string.Empty;
+      ApplicationId = Guid.Empty;
+      CreateDate = DateTime.Now;
+      LastActivityDate = DateTime.Now;
+      LastLoginDate = DateTime.Now;
+      LastLockoutDate = DateTime.Now;
+      LastPasswordChangeDate = DateTime.Now;
+    }
 
-    // Member of Membership
     [DataMember]
-    public Guid ApplicationId { get; set; } // Membership
+    public Guid ApplicationId { get; set; }
+
     [DataMember]
-    public string Password { get; set; } // Membership
-    //[DataMember]
-    //public string PasswordFormat { get; set; } // Membership
+    public string Email { get; set; }
+
     [DataMember]
-    public string PasswordSalt { get; set; } // Membership
-    
-    /// Change PW ?! welcher Hash in DB
+    public bool IsApproved { get; set; }
 
+    [DataMember]
+    public bool IsLookedOut { get; set; }
 
-    //[DataMember]
-    //public string MobilePIN { get; set; } // Membership
     [DataMember]
-    public string Email { get; set; } // Membership
-    //[DataMember]
-    //public string LoweredEmail { get; set; } // Membership
-    //[DataMember]
-    //public string PasswordQuestion { get; set; } // Membership
-    //[DataMember]
-    //public string PasswordAnswer { get; set; } // Membership
+    public DateTime CreateDate { get; set; }
+
     [DataMember]
-    public bool IsApproved { get; set; } // Membership
+    public DateTime LastLoginDate { get; set; }
+
     [DataMember]
-    public bool IsLookedOut { get; set; } // Membership
+    public DateTime LastPasswordChangeDate { get; set; }
+
     [DataMember]
-    public DateTime CreateDate { get; set; } // Membership
+    public DateTime LastLockoutDate { get; set; }
+
     [DataMember]
-    public DateTime LastLoginDate { get; set; } // Membership
-    [DataMember]
-    public DateTime LastPasswordChangeDate { get; set; } // Memership
-    [DataMember]
-    public DateTime LastLockoutDate { get; set; } // Membership
-    //[DataMember]
-    //public int FailedPasswordAttemptCount { get; set; } // Membership
-    //[DataMember]
-    //public DateTime FailedPasswordAttemptWindowStart { get; set; } // Membership
-    //[DataMember]
-    //public int FailedPasswordAnswerAttemptCount { get; set; } // Membership
-    //[DataMember]
-    //public DateTime FailedPasswordAnswerAttemptWindowStart { get; set; } // Membership
-    [DataMember]
-    public string Comment { get; set; } // Membership
-    // Members of User
-    //[DataMember]
-    //public string LoweredUserName { get; set; } // User
-    //[DataMember]
-    //public string MobileAlias { get; set; } // User
-    //[DataMember]
-    //public bool IsAnonymous { get; set; } // User
-    [DataMember]
-    public DateTime LastActivityDate { get; set; } // User
-
+    public DateTime LastActivityDate { get; set; }
   }
-
-
-
-    //[DataContract]
-    //public class User
-    //{
-
-    //    public User()
-    //    {
-    //        Membership = new Membership();
-    //    }
-
-    //    [DataMember]
-    //    public Membership Membership { get; set; }
-
-    //    [DataMember]
-    //    public string Email
-    //    {
-    //        get { return Membership.Email; }
-    //        set { Membership.Email = value; }
-    //    }
-    //    [DataMember]
-    //    public string Password
-    //    {
-    //        get { return Membership.Password; }
-    //        set { Membership.Password = value; }
-    //    }
-    //    [DataMember]
-    //    public string PasswordQuestion
-    //    {
-    //        get { return Membership.PasswordQuestion; }
-    //        set { this.Membership.PasswordQuestion = value; }
-    //    }
-    //    [DataMember]
-    //    public Guid ApplicationId { get; set; }
-    //    [DataMember]
-    //    public Guid UserId { get; set; }
-    //    [DataMember]
-    //    public string UserName { get; set; }
-    //    [DataMember]
-    //    public string LoweredUserName { get; set; }
-    //    [DataMember]
-    //    public string MobileAlias { get; set; }
-    //    [DataMember]
-    //    public bool IsAnonymous { get; set; }
-    //    [DataMember]
-    //    public DateTime LastActivityDate { get; set; }
-
-    //}
 }

branches/UserManagement/HeuristicLab.Services.Authentication.ServiceClients/AuthenticationClient.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab 
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * 
+ * This file is part of HeuristicLab. 
+ * 
+ * HeuristicLab is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * HeuristicLab is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 
+ */
+#endregion
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -6 +26 @@
 using System.ServiceModel.Security;
 using System.ServiceModel;
-
-namespace HeuristicLab.Services.Authentication.ServiceClients
-{
-    public class AuthenticationClient
-    {
-
-        private static AuthenticationClient instance;
-        public static AuthenticationClient Instance
-        {
-            get
-            {
-                if (instance == null) instance = new AuthenticationClient();
-                return instance;
-            }
-        }
-
-        #region Properties
-
-        private IEnumerable<User> users;
-        public IEnumerable<User> Users
-        {
-            get { return users; }
-        }
-        private IEnumerable<Application> applications;
-        public IEnumerable<Application> Applications
-        {
-            get { return applications; }
-        }
-
-        private IEnumerable<Role> roles;
-        public IEnumerable<Role> Roles
-        {
-            get { return roles; }
-        }
-
-        #endregion
-
-
-        private AuthenticationClient()
-        {
-            applications = GetApplications();
-            users = CallService<User[]>(s => s.GetAllUsers()).OrderBy(x => x.Name);
-            roles = CallService<Role[]>(s => s.GetAllRoles()).OrderBy(x => x.Name);
-        }
-
-
-
-        #region Store
-
-        public bool Store(AuthenticationItem item)
-        {
-            try
-            {
-                if (item.Id == Guid.Empty)
-                {
-                    if (item is Role)
-                        item.Id = CallService<Guid>(s => s.AddRole((Role)item));
-                    else if (item is User)
-                        item.Id = CallService<Guid>(s => s.AddUser((User)item));
-                    else if (item is Application)
-                        item.Id = CallService<Guid>(s => s.AddApplication((Application)item));
-
-                }
-                else
-                {
-                    if (item is Role)
-                        CallService(s => s.UpdateRole((Role)item));
-                    else if (item is User)
-                        CallService(s => s.UpdateUser((User)item));
-                    else if (item is Application)
-                        CallService(s => s.UpdateApplication((Application)item));
-
-                }
-                return true;
-            }
-            catch (Exception ex)
-            {
-                //ErrorHandling.ShowErrorDialog("Store failed.", ex);
-                return false;
-            }
-        }
-
-        #endregion
-
-        #region Refresh
-
-        public void Refresh()
-        {
-
-            var call = new Func<Exception>(delegate()
-            {
-
-                Guid applicationId = Guid.Empty; // to be set!
-
-                try
-                {
-                    users = CallService<User[]>(s => s.GetUsers(applicationId)).OrderBy(x => x.Name);
-                    roles = CallService<Role[]>(s => s.GetRoles(applicationId)).OrderBy(x => x.Name);
-                    
-                    // ...
-
-                    return null;
-                }
-                catch (Exception ex)
-                {
-                    return ex;
-                }
-            });
-            call.BeginInvoke(delegate(IAsyncResult result)
-            {
-                Exception ex = call.EndInvoke(result);
-                if (ex != null)
-                {
-                    //ErrorHandling.ShowErrorDialog("Refresh failed.", ex);
-                }
-
-            }, null);
-        }
-
-
-        #endregion
-
-        private T CallService<T>(Func<IAuthenticationService, T> call)
-        {
-            AuthenticationServiceClient client = new AuthenticationServiceClient();
-            client.ClientCredentials.UserName.UserName = "Alice";
-            client.ClientCredentials.UserName.Password = "YouWillNeverKnow";
-            client.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = X509CertificateValidationMode.None;
-            //AuthenticationServiceClient client = ClientFactory.Create<AuthenticationClient, IAuthenticationService>();
-            try
-            {
-                return call(client);
-            }
-            finally
-            {
-                try
-                {
-                    client.Close();
-                }
-                catch (Exception)
-                {
-                    client.Abort();
-                }
-            }
-        }
-
-
-      #region Application methods
-
-        public Application GetApplication(Guid applicationId)
-        {
-            try
-            {
-                return CallService<Application>(s => s.GetApplication(applicationId));
-            }
-            catch (Exception ex)
-            {
-                //ErrorHandling.ShowErrorDialog("Refresh problem data failed.", ex);
-                return null;
-            }
-        }
-
-
-        public Guid AddApplication(Application application) {
-          try {
-            return CallService<Guid>(s => s.AddApplication(application));
+using HeuristicLab.Core;
+using HeuristicLab.Collections;
+
+namespace HeuristicLab.Services.Authentication {
+  public class AuthenticationClient {
+
+    private static AuthenticationClient instance;
+    public static AuthenticationClient Instance {
+      get {
+        if (instance == null) instance = new AuthenticationClient();
+        return instance;
+      }
+    }
+
+    #region Properties
+
+    private ItemCollection<User> users;
+    public ItemCollection<User> Users {
+      get { return users; }
+    }
+    private ItemCollection<Application> applications;
+    public ItemCollection<Application> Applications {
+      get { return applications; }
+    }
+
+    private ItemCollection<Role> roles;
+    public ItemCollection<Role> Roles {
+      get { return roles; }
+    }
+
+    #endregion
+
+
+    private AuthenticationClient() {
+      applications = new ItemCollection<Application>();
+      applications.ItemsRemoved += new CollectionItemsChangedEventHandler<Application>(applications_ItemsRemoved);
+
+      users = new ItemCollection<User>();
+      users.ItemsRemoved += new CollectionItemsChangedEventHandler<User>(users_ItemsRemoved);
+
+      roles = new ItemCollection<Role>();
+      roles.ItemsRemoved += new CollectionItemsChangedEventHandler<Role>(roles_ItemsRemoved);
+    }
+
+
+    #region Store
+
+    public bool Store(AuthenticationItem item) {
+      try {
+        if (item.Id == Guid.Empty) {
+          if (item is Role)
+            item.Id = CallService<Guid>(s => s.AddRole((Role)item));
+          else if (item is User)
+            item.Id = CallService<Guid>(s => s.AddUser((User)item));
+          else if (item is Application)
+            item.Id = CallService<Guid>(s => s.AddApplication((Application)item));
+        } else {
+          if (item is Role)
+            CallService(s => s.UpdateRole((Role)item));
+          else if (item is User)
+            CallService(s => s.UpdateUser((User)item));
+          else if (item is Application)
+            CallService(s => s.UpdateApplication((Application)item));
+        }
+
+        return true;
+      }
+      catch (Exception ex) {
+        //ErrorHandling.ShowErrorDialog("Store failed.", ex);
+        return false;
+      }
+    }
+
+    #endregion
+
+    #region Refresh
+
+    public void Refresh(Guid applicationId) {
+      OnRefreshing();
+
+      users.Clear();
+      roles.Clear();
+      applications.Clear();
+
+      var call = new Func<Exception>(delegate() {
+        try {
+          applications.AddRange(CallService<Application[]>(s => s.GetApplications()).OrderBy(x => x.Name).ToArray());
+          if (!applicationId.Equals(Guid.Empty)) {
+            users.AddRange(CallService<User[]>(s => s.GetUsersForApplication(applicationId)).OrderBy(x => x.Name).ToArray());
+            roles.AddRange(CallService<Role[]>(s => s.GetRolesForApplication(applicationId)).OrderBy(x => x.Name).ToArray());
           }
-          catch (Exception ex) {
-            // Todo Errorhandling
-            return Guid.Empty;
-          }
-        }
-
-        public bool DeleteApplication(Guid id) {
-          try {
-            return CallService<bool>(s => s.DeleteApplication(id));
-          }
-          catch (Exception ex) {
-            // Todo Errorhandling
-            return false;
-          }
-        }
-
-        public IEnumerable<Application> GetApplications() {
-          try {
-            return CallService<IEnumerable<Application>>(s => s.GetApplications());
-          }
-          catch (Exception ex) {
-            // Todo Errorhandling
-            return null;
-
-          }
-        }
-
-
-        public bool UpdateApplication(Application application) {
-          try {
-            return CallService<bool>(s => s.UpdateApplication(application));
-          }
-          catch (Exception ex) {
-            // Todo Errorhandling
-            return false;
-          }
-        }
-
- 
-        #endregion
-
-      #region Role Methods
-
-      public Role GetRole (Guid Id) {
+          return null;
+        }
+        catch (Exception ex) {
+          return ex;
+        }
+      });
+      call.BeginInvoke(delegate(IAsyncResult result) {
+        Exception ex = call.EndInvoke(result);
+        if (ex != null) {
+          //ErrorHandling.ShowErrorDialog("Refresh failed.", ex);
+        }
+        OnRefreshed();
+      }, null);
+    }
+
+
+    #endregion
+
+    #region Helpers
+
+    private void CallService(Action<IAuthenticationService> call) {
+      AuthenticationServiceClient client = new AuthenticationServiceClient();
+      client.ClientCredentials.UserName.UserName = "Alice";
+      client.ClientCredentials.UserName.Password = "YouWillNeverKnow";
+      client.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = X509CertificateValidationMode.None;
+      //AuthenticationServiceClient client = ClientFactory.Create<AuthenticationClient, IAuthenticationService>();
+      try {
+        call(client);
+      }
+      finally {
         try {
-          return CallService<Role>(s => s.GetRole(Id));
-        }
-        catch (Exception ex) {
-          // todo Errorhandling
-          return null;
-        }
-      }
-
-      public IEnumerable<Role> GetAllRoles() {
+          client.Close();
+        }
+        catch (Exception) {
+          client.Abort();
+        }
+      }
+    }
+
+    private T CallService<T>(Func<IAuthenticationService, T> call) {
+      AuthenticationServiceClient client = new AuthenticationServiceClient();
+      client.ClientCredentials.UserName.UserName = "Alice";
+      client.ClientCredentials.UserName.Password = "YouWillNeverKnow";
+      client.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = X509CertificateValidationMode.None;
+      //AuthenticationServiceClient client = ClientFactory.Create<AuthenticationClient, IAuthenticationService>();
+      try {
+        return call(client);
+      }
+      finally {
         try {
-          return CallService<IEnumerable<Role>>(s => s.GetAllRoles());
-        }
-        catch (Exception ex) {
-          // Todo Errorhandling
-          return null;
-        }
-      }
-
-      public IEnumerable<Role> GetRoles(Guid applicationId) {
-        try {
-          return CallService<IEnumerable<Role>>(s => s.GetRoles(applicationId));
-        }
-        catch (Exception ex) {
-          // Todo Errorhandling
-          return null;
-        }
-      }
-
-      public Guid AddRole(Role role) {
-        try {
-          return CallService<Guid>(s => s.AddRole(role));
-        }
-        catch (Exception ex) {
-          // Todo Errorhandling
-          return Guid.Empty;
-
-        }
-      }
-
-      public bool UpdateRole(Role role) {
-        try {
-          return CallService<bool>(s => s.UpdateRole(role));
-        }
-        catch (Exception ex) {
-          // Todo Errorhandling
-          return false;
-        }
-      }
-
-
-      public bool DeleteRole(Guid Id) {
-        try {
-          return CallService<bool>(s => s.DeleteRole(Id));
-        }
-        catch (Exception ex) {
-          // Todo Errorhandling
-          return false;
-        }
-      }
-
-
-      #endregion
-
-      #region User methods
-
-      public User GetUser(Guid Id) {
-        try {
-          return CallService<User>(s => s.GetUser(Id));
-        }
-        catch (Exception ex) {
-          // Todo Errorhandling
-          return null;
-        }
-      }
-
-      public IEnumerable<User> GetAllUsers() {
-        try {
-          return CallService<IEnumerable<User>>(s => s.GetAllUsers());
-        }
-        catch (Exception ex) {
-          // Todo Errorhandling
-          return null;
-        }
-      }
-
-      public IEnumerable<User> GetUsers(Guid applicationId) {
-        try {
-          return CallService<IEnumerable<User>>(s => s.GetUsers(applicationId));
-        }
-        catch (Exception ex) {
-          // Todo Errorhandling
-          return null;
-        }
-      }
-
-      public Guid AddUser(User user) {
-        try {
-          return CallService<Guid>(s => s.AddUser(user));
-        }
-        catch (Exception ex) {
-          // Todo Errorhandling
-          return Guid.Empty;
-        }
-      }
-
-      public bool UpdateUser(User user) {
-        try {
-          return CallService<bool>(s => s.UpdateUser(user));
-        }
-        catch (Exception ex) {
-          // Todo Errorhandling
-          return false;
-        }
-      }
-
-
-      public bool AddUserToRole(Guid roleId, Guid userId) {
-        try {
-          return CallService<bool>(s => s.AddUserToRole(roleId, userId);
-        }
-        catch (Exception ex) {
-          // Todo Errorhandling
-          return false;
-        }
-      }
-
-
-      public IEnumerable<Guid> GetUsersInRole(Guid roleId) {
-        try {
-          return CallService<IEnumerable<Guid>>(s => s.GetUsersInRole(roleId));
-        }
-        catch (Exception ex) {
-          // Todo Errorhandling
-          return null;
-        }
-      }
-
-
-      #endregion
-
-
-
-
-      //public static void Main() {
-        //    AuthenticationServiceClient auth = new AuthenticationServiceClient();
-
-        //    auth.ClientCredentials.UserName.UserName = "Alice";
-        //    auth.ClientCredentials.UserName.Password = "YouWillKnow";
-        //    auth.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = X509CertificateValidationMode.None;
-
-        //    Application[] apps = auth.GetApplications();
-        //    foreach (Application app in apps) {
-        //        Console.WriteLine(app.Name);
-        //    }
-        //    Console.ReadLine();
-        //}
-    }
+          client.Close();
+        }
+        catch (Exception) {
+          client.Abort();
+        }
+      }
+    }
+
+    #endregion
+
+    #region Application methods
+
+    public Application GetApplication(Guid applicationId) {
+      try {
+        return CallService<Application>(s => s.GetApplication(applicationId));
+      }
+      catch (Exception ex) {
+        //ErrorHandling.ShowErrorDialog("Refresh problem data failed.", ex);
+        return null;
+      }
+    }
+
+    public IEnumerable<Application> GetApplications() {
+      try {
+        return CallService<IEnumerable<Application>>(s => s.GetApplications());
+      }
+      catch (Exception ex) {
+        // Todo Errorhandling
+        return null;
+
+      }
+    }
+
+
+
+    #endregion
+
+    #region Role Methods
+
+    public Role GetRole(Guid Id) {
+      try {
+        return CallService<Role>(s => s.GetRole(Id));
+      }
+      catch (Exception ex) {
+        // todo Errorhandling
+        return null;
+      }
+    }
+
+    public IEnumerable<Guid> GetRolesForUser(Guid userId) {
+      try {
+        return CallService<IEnumerable<Guid>>(s => s.GetRolesForUser(userId));
+      }
+      catch (Exception ex) {
+        // Todo Errorhandling
+        return null;
+      }
+    }
+
+
+    #endregion
+
+    #region User methods
+
+    public User GetUser(Guid Id) {
+      try {
+        return CallService<User>(s => s.GetUser(Id));
+      }
+      catch (Exception ex) {
+        // Todo Errorhandling
+        return null;
+      }
+    }
+
+    public IEnumerable<User> GetUsers() {
+      try {
+        return CallService<IEnumerable<User>>(s => s.GetUsers());
+      }
+      catch (Exception ex) {
+        // Todo Errorhandling
+        return null;
+      }
+    }
+
+
+    public bool IsUserInRole(Guid userId, Guid roleId) {
+      try {
+        return CallService<bool>(s => s.IsUserInRole(userId, roleId));
+      }
+      catch (Exception ex) {
+        // Todo Errorhandling
+        return false;
+      }
+    }
+
+
+    public void AddUserToRole(Guid roleId, Guid userId) {
+      try {
+        CallService(s => s.AddUserToRole(roleId, userId));
+      }
+      catch (Exception ex) {
+        // Todo Errorhandling
+
+      }
+    }
+
+    public void RemoveUserFromRole(Guid roleId, Guid userId) {
+      try {
+        CallService(s => s.RemoveUserFromRole(roleId, userId));
+      }
+      catch (Exception ex) {
+        // Todo Errorhandling
+
+      }
+    }
+
+
+    public IEnumerable<Guid> GetUsersInRole(Guid roleId) {
+      try {
+        return CallService<IEnumerable<Guid>>(s => s.GetUsersInRole(roleId));
+      }
+      catch (Exception ex) {
+        // Todo Errorhandling
+        return null;
+      }
+    }
+
+    public User ResetPassword(string applicationName, string userName, string password) {
+      try {
+        return CallService<User>(s => s.ResetPassword(applicationName, userName, password));
+      }
+      catch (Exception ex) {
+        // Todo Errorhandling
+        return null;
+      }
+    }
+
+    #endregion
+
+    #region Events
+    public event EventHandler Refreshing;
+    private void OnRefreshing() {
+      EventHandler handler = Refreshing;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler Refreshed;
+    private void OnRefreshed() {
+      EventHandler handler = Refreshed;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+
+
+    void roles_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<Role> e) {
+      try {
+        foreach (Role r in e.Items)
+          CallService(s => s.DeleteRole(r.Id));
+      }
+      catch (Exception ex) {
+        // ErrorHandling.ShowErrorDialog("Delete failed.", ex);
+      }
+    }
+
+    void users_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<User> e) {
+      try {
+        foreach (User u in e.Items)
+          CallService(s => s.DeleteUser(u.Id));
+      }
+      catch (Exception ex) {
+        // ErrorHandling.ShowErrorDialog("Delete failed.", ex);
+      }
+    }
+
+    void applications_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<Application> e) {
+      try {
+        foreach (Application a in e.Items)
+          CallService(s => s.DeleteApplication(a.Id));
+      }
+      catch (Exception ex) {
+        // ErrorHandling.ShowErrorDialog("Delete failed.", ex);
+      }
+    }
+
+    #endregion
+  }
 }

branches/UserManagement/HeuristicLab.Services.Authentication.ServiceClients/ClientFactory.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab 
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * 
+ * This file is part of HeuristicLab. 
+ * 
+ * HeuristicLab is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * HeuristicLab is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 
+ */
+#endregion
+using System;
 using System.Collections.Generic;
 using System.Linq;

branches/UserManagement/HeuristicLab.Services.Authentication.ServiceClients/HeuristicLab.Services.Authentication.ServiceClient.csproj

@@ -35 +35 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Collections-3.3">
+      <HintPath>..\HeuristicLab.Collections-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Common-3.3">
+      <HintPath>..\HeuristicLab.Common-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Common.Resources-3.3">
+      <HintPath>..\HeuristicLab.Common.Resources-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Core-3.3">
+      <HintPath>..\HeuristicLab.Core-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Linq" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
@@ -50 +63 @@
     <Compile Include="ClientFactory.cs" />
     <Compile Include="ServiceClients\Application.cs" />
+    <Compile Include="ServiceClients\AuthenticationItem.cs" />
     <Compile Include="ServiceClients\AuthenticationServiceClient.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

branches/UserManagement/HeuristicLab.Services.Authentication.ServiceClients/ServiceClients/Application.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab 
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * 
+ * This file is part of HeuristicLab. 
+ * 
+ * HeuristicLab is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * HeuristicLab is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 
+ */
+#endregion
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using HeuristicLab.Core;
+using HeuristicLab.Common;
 
-namespace HeuristicLab.Services.Authentication
-{
-    public partial class Application
-    {
+namespace HeuristicLab.Services.Authentication {
+  [Item("Application", "An application.")]
+  public partial class Application {
+    protected Application(Application original, Cloner cloner)
+      : base(original, cloner) {
+
     }
+
+    public Application() {
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Application(this, cloner);
+    }
+  }
 }

branches/UserManagement/HeuristicLab.Services.Authentication.ServiceClients/ServiceClients/AuthenticationServiceClient.cs

@@ -1 @@
-//------------------------------------------------------------------------------
+#region License Information
+/* HeuristicLab 
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * 
+ * This file is part of HeuristicLab. 
+ * 
+ * HeuristicLab is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * HeuristicLab is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 
+ */
+#endregion
+//------------------------------------------------------------------------------
 // <auto-generated>
-//     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.1
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.1
 //
-//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-//     der Code erneut generiert wird.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace HeuristicLab.Services.Authentication
-{
-    using System.Runtime.Serialization;
-    
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
-    [System.Runtime.Serialization.DataContractAttribute(Name="AuthenticationItem", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Authentication.Data" +
-        "Transfer")]
-    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.NamedAuthenticationItem))]
-    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.Role))]
-    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.Application))]
-    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.User))]
-    public partial class AuthenticationItem : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
-    {
-        
-        private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
-        
-        private System.Guid IdField;
-        
-        public System.Runtime.Serialization.ExtensionDataObject ExtensionData
-        {
-            get
-            {
-                return this.extensionDataField;
-            }
-            set
-            {
-                this.extensionDataField = value;
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Guid Id
-        {
-            get
-            {
-                return this.IdField;
-            }
-            set
-            {
-                if ((this.IdField.Equals(value) != true))
-                {
-                    this.IdField = value;
-                    this.RaisePropertyChanged("Id");
-                }
-            }
-        }
-        
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        
-        protected void RaisePropertyChanged(string propertyName)
-        {
-            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null))
-            {
-                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
-    [System.Runtime.Serialization.DataContractAttribute(Name="NamedAuthenticationItem", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Authentication.Data" +
-        "Transfer")]
-    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.Role))]
-    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.Application))]
-    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.User))]
-    public partial class NamedAuthenticationItem : HeuristicLab.Services.Authentication.AuthenticationItem
-    {
-        
-        private string NameField;
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public string Name
-        {
-            get
-            {
-                return this.NameField;
-            }
-            set
-            {
-                if ((object.ReferenceEquals(this.NameField, value) != true))
-                {
-                    this.NameField = value;
-                    this.RaisePropertyChanged("Name");
-                }
-            }
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
-    [System.Runtime.Serialization.DataContractAttribute(Name="Role", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Authentication.Data" +
-        "Transfer")]
-    public partial class Role : HeuristicLab.Services.Authentication.NamedAuthenticationItem
-    {
-        
-        private System.Guid ApplicationIdField;
-        
-        private string DescriptionField;
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Guid ApplicationId
-        {
-            get
-            {
-                return this.ApplicationIdField;
-            }
-            set
-            {
-                if ((this.ApplicationIdField.Equals(value) != true))
-                {
-                    this.ApplicationIdField = value;
-                    this.RaisePropertyChanged("ApplicationId");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public string Description
-        {
-            get
-            {
-                return this.DescriptionField;
-            }
-            set
-            {
-                if ((object.ReferenceEquals(this.DescriptionField, value) != true))
-                {
-                    this.DescriptionField = value;
-                    this.RaisePropertyChanged("Description");
-                }
-            }
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
-    [System.Runtime.Serialization.DataContractAttribute(Name="Application", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Authentication.Data" +
-        "Transfer")]
-    public partial class Application : HeuristicLab.Services.Authentication.NamedAuthenticationItem
-    {
-        
-        private string DescriptionField;
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public string Description
-        {
-            get
-            {
-                return this.DescriptionField;
-            }
-            set
-            {
-                if ((object.ReferenceEquals(this.DescriptionField, value) != true))
-                {
-                    this.DescriptionField = value;
-                    this.RaisePropertyChanged("Description");
-                }
-            }
-        }
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
-    [System.Runtime.Serialization.DataContractAttribute(Name="User", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Authentication.Data" +
-        "Transfer")]
-    public partial class User : HeuristicLab.Services.Authentication.NamedAuthenticationItem
-    {
-        
-        private System.Guid ApplicationIdField;
-        
-        private string CommentField;
-        
-        private System.DateTime CreateDateField;
-        
-        private string EmailField;
-        
-        private bool IsApprovedField;
-        
-        private bool IsLookedOutField;
-        
-        private System.DateTime LastActivityDateField;
-        
-        private System.DateTime LastLockoutDateField;
-        
-        private System.DateTime LastLoginDateField;
-        
-        private System.DateTime LastPasswordChangeDateField;
-        
-        private string PasswordField;
-        
-        private string PasswordSaltField;
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Guid ApplicationId
-        {
-            get
-            {
-                return this.ApplicationIdField;
-            }
-            set
-            {
-                if ((this.ApplicationIdField.Equals(value) != true))
-                {
-                    this.ApplicationIdField = value;
-                    this.RaisePropertyChanged("ApplicationId");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public string Comment
-        {
-            get
-            {
-                return this.CommentField;
-            }
-            set
-            {
-                if ((object.ReferenceEquals(this.CommentField, value) != true))
-                {
-                    this.CommentField = value;
-                    this.RaisePropertyChanged("Comment");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.DateTime CreateDate
-        {
-            get
-            {
-                return this.CreateDateField;
-            }
-            set
-            {
-                if ((this.CreateDateField.Equals(value) != true))
-                {
-                    this.CreateDateField = value;
-                    this.RaisePropertyChanged("CreateDate");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public string Email
-        {
-            get
-            {
-                return this.EmailField;
-            }
-            set
-            {
-                if ((object.ReferenceEquals(this.EmailField, value) != true))
-                {
-                    this.EmailField = value;
-                    this.RaisePropertyChanged("Email");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public bool IsApproved
-        {
-            get
-            {
-                return this.IsApprovedField;
-            }
-            set
-            {
-                if ((this.IsApprovedField.Equals(value) != true))
-                {
-                    this.IsApprovedField = value;
-                    this.RaisePropertyChanged("IsApproved");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public bool IsLookedOut
-        {
-            get
-            {
-                return this.IsLookedOutField;
-            }
-            set
-            {
-                if ((this.IsLookedOutField.Equals(value) != true))
-                {
-                    this.IsLookedOutField = value;
-                    this.RaisePropertyChanged("IsLookedOut");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.DateTime LastActivityDate
-        {
-            get
-            {
-                return this.LastActivityDateField;
-            }
-            set
-            {
-                if ((this.LastActivityDateField.Equals(value) != true))
-                {
-                    this.LastActivityDateField = value;
-                    this.RaisePropertyChanged("LastActivityDate");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.DateTime LastLockoutDate
-        {
-            get
-            {
-                return this.LastLockoutDateField;
-            }
-            set
-            {
-                if ((this.LastLockoutDateField.Equals(value) != true))
-                {
-                    this.LastLockoutDateField = value;
-                    this.RaisePropertyChanged("LastLockoutDate");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.DateTime LastLoginDate
-        {
-            get
-            {
-                return this.LastLoginDateField;
-            }
-            set
-            {
-                if ((this.LastLoginDateField.Equals(value) != true))
-                {
-                    this.LastLoginDateField = value;
-                    this.RaisePropertyChanged("LastLoginDate");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.DateTime LastPasswordChangeDate
-        {
-            get
-            {
-                return this.LastPasswordChangeDateField;
-            }
-            set
-            {
-                if ((this.LastPasswordChangeDateField.Equals(value) != true))
-                {
-                    this.LastPasswordChangeDateField = value;
-                    this.RaisePropertyChanged("LastPasswordChangeDate");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public string Password
-        {
-            get
-            {
-                return this.PasswordField;
-            }
-            set
-            {
-                if ((object.ReferenceEquals(this.PasswordField, value) != true))
-                {
-                    this.PasswordField = value;
-                    this.RaisePropertyChanged("Password");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public string PasswordSalt
-        {
-            get
-            {
-                return this.PasswordSaltField;
-            }
-            set
-            {
-                if ((object.ReferenceEquals(this.PasswordSaltField, value) != true))
-                {
-                    this.PasswordSaltField = value;
-                    this.RaisePropertyChanged("PasswordSalt");
-                }
-            }
-        }
-    }
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    [System.ServiceModel.ServiceContractAttribute(ConfigurationName="HeuristicLab.Services.Authentication.IAuthenticationService")]
-    public interface IAuthenticationService
-    {
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetUser", ReplyAction="http://tempuri.org/IAuthenticationService/GetUserResponse")]
-        HeuristicLab.Services.Authentication.User GetUser(System.Guid id);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetAllUsers", ReplyAction="http://tempuri.org/IAuthenticationService/GetAllUsersResponse")]
-        HeuristicLab.Services.Authentication.User[] GetAllUsers();
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetUsers", ReplyAction="http://tempuri.org/IAuthenticationService/GetUsersResponse")]
-        HeuristicLab.Services.Authentication.User[] GetUsers(System.Guid applicationId);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/AddUser", ReplyAction="http://tempuri.org/IAuthenticationService/AddUserResponse")]
-        System.Guid AddUser(HeuristicLab.Services.Authentication.User user);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/DeleteUser", ReplyAction="http://tempuri.org/IAuthenticationService/DeleteUserResponse")]
-        bool DeleteUser(System.Guid id);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/UpdateUser", ReplyAction="http://tempuri.org/IAuthenticationService/UpdateUserResponse")]
-        bool UpdateUser(HeuristicLab.Services.Authentication.User user);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/AddUserToRole", ReplyAction="http://tempuri.org/IAuthenticationService/AddUserToRoleResponse")]
-        bool AddUserToRole(System.Guid roleId, System.Guid userId);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetUsersInRole", ReplyAction="http://tempuri.org/IAuthenticationService/GetUsersInRoleResponse")]
-        System.Guid[] GetUsersInRole(System.Guid roleId);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/RemoveUserFromRole", ReplyAction="http://tempuri.org/IAuthenticationService/RemoveUserFromRoleResponse")]
-        bool RemoveUserFromRole(System.Guid roleId, System.Guid userId);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/IsUserInRole", ReplyAction="http://tempuri.org/IAuthenticationService/IsUserInRoleResponse")]
-        bool IsUserInRole(System.Guid userId, System.Guid roleId);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetRole", ReplyAction="http://tempuri.org/IAuthenticationService/GetRoleResponse")]
-        HeuristicLab.Services.Authentication.Role GetRole(System.Guid id);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetAllRoles", ReplyAction="http://tempuri.org/IAuthenticationService/GetAllRolesResponse")]
-        HeuristicLab.Services.Authentication.Role[] GetAllRoles();
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetRoles", ReplyAction="http://tempuri.org/IAuthenticationService/GetRolesResponse")]
-        HeuristicLab.Services.Authentication.Role[] GetRoles(System.Guid applicationId);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/AddRole", ReplyAction="http://tempuri.org/IAuthenticationService/AddRoleResponse")]
-        System.Guid AddRole(HeuristicLab.Services.Authentication.Role role);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/UpdateRole", ReplyAction="http://tempuri.org/IAuthenticationService/UpdateRoleResponse")]
-        bool UpdateRole(HeuristicLab.Services.Authentication.Role role);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/DeleteRole", ReplyAction="http://tempuri.org/IAuthenticationService/DeleteRoleResponse")]
-        bool DeleteRole(System.Guid id);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetRolesForUser", ReplyAction="http://tempuri.org/IAuthenticationService/GetRolesForUserResponse")]
-        System.Guid[] GetRolesForUser(System.Guid userId);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetApplication", ReplyAction="http://tempuri.org/IAuthenticationService/GetApplicationResponse")]
-        HeuristicLab.Services.Authentication.Application GetApplication(System.Guid id);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/AddApplication", ReplyAction="http://tempuri.org/IAuthenticationService/AddApplicationResponse")]
-        System.Guid AddApplication(HeuristicLab.Services.Authentication.Application application);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/DeleteApplication", ReplyAction="http://tempuri.org/IAuthenticationService/DeleteApplicationResponse")]
-        bool DeleteApplication(System.Guid id);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetApplications", ReplyAction="http://tempuri.org/IAuthenticationService/GetApplicationsResponse")]
-        HeuristicLab.Services.Authentication.Application[] GetApplications();
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/UpdateApplication", ReplyAction="http://tempuri.org/IAuthenticationService/UpdateApplicationResponse")]
-        bool UpdateApplication(HeuristicLab.Services.Authentication.Application application);
-    }
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    public interface IAuthenticationServiceChannel : HeuristicLab.Services.Authentication.IAuthenticationService, System.ServiceModel.IClientChannel
-    {
-    }
-    
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
-    public partial class AuthenticationServiceClient : System.ServiceModel.ClientBase<HeuristicLab.Services.Authentication.IAuthenticationService>, HeuristicLab.Services.Authentication.IAuthenticationService
-    {
-        
-        public AuthenticationServiceClient()
-        {
-        }
-        
-        public AuthenticationServiceClient(string endpointConfigurationName) : 
-                base(endpointConfigurationName)
-        {
-        }
-        
-        public AuthenticationServiceClient(string endpointConfigurationName, string remoteAddress) : 
-                base(endpointConfigurationName, remoteAddress)
-        {
-        }
-        
-        public AuthenticationServiceClient(string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) : 
-                base(endpointConfigurationName, remoteAddress)
-        {
-        }
-        
-        public AuthenticationServiceClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : 
-                base(binding, remoteAddress)
-        {
-        }
-        
-        public HeuristicLab.Services.Authentication.User GetUser(System.Guid id)
-        {
-            return base.Channel.GetUser(id);
-        }
-        
-        public HeuristicLab.Services.Authentication.User[] GetAllUsers()
-        {
-            return base.Channel.GetAllUsers();
-        }
-        
-        public HeuristicLab.Services.Authentication.User[] GetUsers(System.Guid applicationId)
-        {
-            return base.Channel.GetUsers(applicationId);
-        }
-        
-        public System.Guid AddUser(HeuristicLab.Services.Authentication.User user)
-        {
-            return base.Channel.AddUser(user);
-        }
-        
-        public bool DeleteUser(System.Guid id)
-        {
-            return base.Channel.DeleteUser(id);
-        }
-        
-        public bool UpdateUser(HeuristicLab.Services.Authentication.User user)
-        {
-            return base.Channel.UpdateUser(user);
-        }
-        
-        public bool AddUserToRole(System.Guid roleId, System.Guid userId)
-        {
-            return base.Channel.AddUserToRole(roleId, userId);
-        }
-        
-        public System.Guid[] GetUsersInRole(System.Guid roleId)
-        {
-            return base.Channel.GetUsersInRole(roleId);
-        }
-        
-        public bool RemoveUserFromRole(System.Guid roleId, System.Guid userId)
-        {
-            return base.Channel.RemoveUserFromRole(roleId, userId);
-        }
-        
-        public bool IsUserInRole(System.Guid userId, System.Guid roleId)
-        {
-            return base.Channel.IsUserInRole(userId, roleId);
-        }
-        
-        public HeuristicLab.Services.Authentication.Role GetRole(System.Guid id)
-        {
-            return base.Channel.GetRole(id);
-        }
-        
-        public HeuristicLab.Services.Authentication.Role[] GetAllRoles()
-        {
-            return base.Channel.GetAllRoles();
-        }
-        
-        public HeuristicLab.Services.Authentication.Role[] GetRoles(System.Guid applicationId)
-        {
-            return base.Channel.GetRoles(applicationId);
-        }
-        
-        public System.Guid AddRole(HeuristicLab.Services.Authentication.Role role)
-        {
-            return base.Channel.AddRole(role);
-        }
-        
-        public bool UpdateRole(HeuristicLab.Services.Authentication.Role role)
-        {
-            return base.Channel.UpdateRole(role);
-        }
-        
-        public bool DeleteRole(System.Guid id)
-        {
-            return base.Channel.DeleteRole(id);
-        }
-        
-        public System.Guid[] GetRolesForUser(System.Guid userId)
-        {
-            return base.Channel.GetRolesForUser(userId);
-        }
-        
-        public HeuristicLab.Services.Authentication.Application GetApplication(System.Guid id)
-        {
-            return base.Channel.GetApplication(id);
-        }
-        
-        public System.Guid AddApplication(HeuristicLab.Services.Authentication.Application application)
-        {
-            return base.Channel.AddApplication(application);
-        }
-        
-        public bool DeleteApplication(System.Guid id)
-        {
-            return base.Channel.DeleteApplication(id);
-        }
-        
-        public HeuristicLab.Services.Authentication.Application[] GetApplications()
-        {
-            return base.Channel.GetApplications();
-        }
-        
-        public bool UpdateApplication(HeuristicLab.Services.Authentication.Application application)
-        {
-            return base.Channel.UpdateApplication(application);
-        }
-    }
+namespace HeuristicLab.Services.Authentication {
+  using System.Runtime.Serialization;
+
+
+  [System.Diagnostics.DebuggerStepThroughAttribute()]
+  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
+  [System.Runtime.Serialization.DataContractAttribute(Name = "AuthenticationItem", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Authentication.Data" +
+      "Transfer")]
+  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.Role))]
+  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.Application))]
+  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.User))]
+  public partial class AuthenticationItem : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
+
+    private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
+
+    private string DescriptionField;
+
+    private System.Guid IdField;
+
+    private string NameField;
+
+    public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
+      get {
+        return this.extensionDataField;
+      }
+      set {
+        this.extensionDataField = value;
+      }
+    }
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public string Description {
+      get {
+        return this.DescriptionField;
+      }
+      set {
+        if ((object.ReferenceEquals(this.DescriptionField, value) != true)) {
+          this.DescriptionField = value;
+          this.RaisePropertyChanged("Description");
+        }
+      }
+    }
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public System.Guid Id {
+      get {
+        return this.IdField;
+      }
+      set {
+        if ((this.IdField.Equals(value) != true)) {
+          this.IdField = value;
+          this.RaisePropertyChanged("Id");
+        }
+      }
+    }
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public string Name {
+      get {
+        return this.NameField;
+      }
+      set {
+        if ((object.ReferenceEquals(this.NameField, value) != true)) {
+          this.NameField = value;
+          this.RaisePropertyChanged("Name");
+        }
+      }
+    }
+
+    public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
+
+
+  }
+
+  [System.Diagnostics.DebuggerStepThroughAttribute()]
+  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
+  [System.Runtime.Serialization.DataContractAttribute(Name = "Role", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Authentication.Data" +
+      "Transfer")]
+  public partial class Role : HeuristicLab.Services.Authentication.AuthenticationItem {
+
+    private System.Guid ApplicationIdField;
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public System.Guid ApplicationId {
+      get {
+        return this.ApplicationIdField;
+      }
+      set {
+        if ((this.ApplicationIdField.Equals(value) != true)) {
+          this.ApplicationIdField = value;
+          this.RaisePropertyChanged("ApplicationId");
+        }
+      }
+    }
+  }
+
+  [System.Diagnostics.DebuggerStepThroughAttribute()]
+  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
+  [System.Runtime.Serialization.DataContractAttribute(Name = "Application", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Authentication.Data" +
+      "Transfer")]
+  public partial class Application : HeuristicLab.Services.Authentication.AuthenticationItem {
+  }
+
+  [System.Diagnostics.DebuggerStepThroughAttribute()]
+  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
+  [System.Runtime.Serialization.DataContractAttribute(Name = "User", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Authentication.Data" +
+      "Transfer")]
+  public partial class User : HeuristicLab.Services.Authentication.AuthenticationItem {
+
+    private System.Guid ApplicationIdField;
+
+    private System.DateTime CreateDateField;
+
+    private string EmailField;
+
+    private bool IsApprovedField;
+
+    private bool IsLookedOutField;
+
+    private System.DateTime LastActivityDateField;
+
+    private System.DateTime LastLockoutDateField;
+
+    private System.DateTime LastLoginDateField;
+
+    private System.DateTime LastPasswordChangeDateField;
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public System.Guid ApplicationId {
+      get {
+        return this.ApplicationIdField;
+      }
+      set {
+        if ((this.ApplicationIdField.Equals(value) != true)) {
+          this.ApplicationIdField = value;
+          this.RaisePropertyChanged("ApplicationId");
+        }
+      }
+    }
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public System.DateTime CreateDate {
+      get {
+        return this.CreateDateField;
+      }
+      set {
+        if ((this.CreateDateField.Equals(value) != true)) {
+          this.CreateDateField = value;
+          this.RaisePropertyChanged("CreateDate");
+        }
+      }
+    }
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public string Email {
+      get {
+        return this.EmailField;
+      }
+      set {
+        if ((object.ReferenceEquals(this.EmailField, value) != true)) {
+          this.EmailField = value;
+          this.RaisePropertyChanged("Email");
+        }
+      }
+    }
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public bool IsApproved {
+      get {
+        return this.IsApprovedField;
+      }
+      set {
+        if ((this.IsApprovedField.Equals(value) != true)) {
+          this.IsApprovedField = value;
+          this.RaisePropertyChanged("IsApproved");
+        }
+      }
+    }
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public bool IsLookedOut {
+      get {
+        return this.IsLookedOutField;
+      }
+      set {
+        if ((this.IsLookedOutField.Equals(value) != true)) {
+          this.IsLookedOutField = value;
+          this.RaisePropertyChanged("IsLookedOut");
+        }
+      }
+    }
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public System.DateTime LastActivityDate {
+      get {
+        return this.LastActivityDateField;
+      }
+      set {
+        if ((this.LastActivityDateField.Equals(value) != true)) {
+          this.LastActivityDateField = value;
+          this.RaisePropertyChanged("LastActivityDate");
+        }
+      }
+    }
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public System.DateTime LastLockoutDate {
+      get {
+        return this.LastLockoutDateField;
+      }
+      set {
+        if ((this.LastLockoutDateField.Equals(value) != true)) {
+          this.LastLockoutDateField = value;
+          this.RaisePropertyChanged("LastLockoutDate");
+        }
+      }
+    }
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public System.DateTime LastLoginDate {
+      get {
+        return this.LastLoginDateField;
+      }
+      set {
+        if ((this.LastLoginDateField.Equals(value) != true)) {
+          this.LastLoginDateField = value;
+          this.RaisePropertyChanged("LastLoginDate");
+        }
+      }
+    }
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public System.DateTime LastPasswordChangeDate {
+      get {
+        return this.LastPasswordChangeDateField;
+      }
+      set {
+        if ((this.LastPasswordChangeDateField.Equals(value) != true)) {
+          this.LastPasswordChangeDateField = value;
+          this.RaisePropertyChanged("LastPasswordChangeDate");
+        }
+      }
+    }
+  }
+
+  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+  [System.ServiceModel.ServiceContractAttribute(ConfigurationName = "HeuristicLab.Services.Authentication.IAuthenticationService")]
+  public interface IAuthenticationService {
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/GetUser", ReplyAction = "http://tempuri.org/IAuthenticationService/GetUserResponse")]
+    HeuristicLab.Services.Authentication.User GetUser(System.Guid id);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/GetUsers", ReplyAction = "http://tempuri.org/IAuthenticationService/GetUsersResponse")]
+    HeuristicLab.Services.Authentication.User[] GetUsers();
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/GetUsersForApplication", ReplyAction = "http://tempuri.org/IAuthenticationService/GetUsersForApplicationResponse")]
+    HeuristicLab.Services.Authentication.User[] GetUsersForApplication(System.Guid applicationId);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/AddUser", ReplyAction = "http://tempuri.org/IAuthenticationService/AddUserResponse")]
+    System.Guid AddUser(HeuristicLab.Services.Authentication.User user);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/DeleteUser", ReplyAction = "http://tempuri.org/IAuthenticationService/DeleteUserResponse")]
+    void DeleteUser(System.Guid id);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/UpdateUser", ReplyAction = "http://tempuri.org/IAuthenticationService/UpdateUserResponse")]
+    void UpdateUser(HeuristicLab.Services.Authentication.User user);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/AddUserToRole", ReplyAction = "http://tempuri.org/IAuthenticationService/AddUserToRoleResponse")]
+    void AddUserToRole(System.Guid roleId, System.Guid userId);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/GetUsersInRole", ReplyAction = "http://tempuri.org/IAuthenticationService/GetUsersInRoleResponse")]
+    System.Guid[] GetUsersInRole(System.Guid roleId);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/RemoveUserFromRole", ReplyAction = "http://tempuri.org/IAuthenticationService/RemoveUserFromRoleResponse")]
+    void RemoveUserFromRole(System.Guid roleId, System.Guid userId);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/IsUserInRole", ReplyAction = "http://tempuri.org/IAuthenticationService/IsUserInRoleResponse")]
+    bool IsUserInRole(System.Guid userId, System.Guid roleId);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/ResetPassword", ReplyAction = "http://tempuri.org/IAuthenticationService/ResetPasswordResponse")]
+    HeuristicLab.Services.Authentication.User ResetPassword(string applicationName, string userName, string password);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/GetRole", ReplyAction = "http://tempuri.org/IAuthenticationService/GetRoleResponse")]
+    HeuristicLab.Services.Authentication.Role GetRole(System.Guid id);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/GetRoles", ReplyAction = "http://tempuri.org/IAuthenticationService/GetRolesResponse")]
+    HeuristicLab.Services.Authentication.Role[] GetRoles();
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/GetRolesForApplication", ReplyAction = "http://tempuri.org/IAuthenticationService/GetRolesForApplicationResponse")]
+    HeuristicLab.Services.Authentication.Role[] GetRolesForApplication(System.Guid applicationId);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/AddRole", ReplyAction = "http://tempuri.org/IAuthenticationService/AddRoleResponse")]
+    System.Guid AddRole(HeuristicLab.Services.Authentication.Role role);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/UpdateRole", ReplyAction = "http://tempuri.org/IAuthenticationService/UpdateRoleResponse")]
+    void UpdateRole(HeuristicLab.Services.Authentication.Role role);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/DeleteRole", ReplyAction = "http://tempuri.org/IAuthenticationService/DeleteRoleResponse")]
+    void DeleteRole(System.Guid id);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/GetRolesForUser", ReplyAction = "http://tempuri.org/IAuthenticationService/GetRolesForUserResponse")]
+    System.Guid[] GetRolesForUser(System.Guid userId);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/GetApplication", ReplyAction = "http://tempuri.org/IAuthenticationService/GetApplicationResponse")]
+    HeuristicLab.Services.Authentication.Application GetApplication(System.Guid id);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/AddApplication", ReplyAction = "http://tempuri.org/IAuthenticationService/AddApplicationResponse")]
+    System.Guid AddApplication(HeuristicLab.Services.Authentication.Application application);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/DeleteApplication", ReplyAction = "http://tempuri.org/IAuthenticationService/DeleteApplicationResponse")]
+    void DeleteApplication(System.Guid id);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/GetApplications", ReplyAction = "http://tempuri.org/IAuthenticationService/GetApplicationsResponse")]
+    HeuristicLab.Services.Authentication.Application[] GetApplications();
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAuthenticationService/UpdateApplication", ReplyAction = "http://tempuri.org/IAuthenticationService/UpdateApplicationResponse")]
+    void UpdateApplication(HeuristicLab.Services.Authentication.Application application);
+  }
+
+  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+  public interface IAuthenticationServiceChannel : HeuristicLab.Services.Authentication.IAuthenticationService, System.ServiceModel.IClientChannel {
+  }
+
+  [System.Diagnostics.DebuggerStepThroughAttribute()]
+  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+  public partial class AuthenticationServiceClient : System.ServiceModel.ClientBase<HeuristicLab.Services.Authentication.IAuthenticationService>, HeuristicLab.Services.Authentication.IAuthenticationService {
+
+    public AuthenticationServiceClient() {
+    }
+
+    public AuthenticationServiceClient(string endpointConfigurationName) :
+      base(endpointConfigurationName) {
+    }
+
+    public AuthenticationServiceClient(string endpointConfigurationName, string remoteAddress) :
+      base(endpointConfigurationName, remoteAddress) {
+    }
+
+    public AuthenticationServiceClient(string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) :
+      base(endpointConfigurationName, remoteAddress) {
+    }
+
+    public AuthenticationServiceClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) :
+      base(binding, remoteAddress) {
+    }
+
+    public HeuristicLab.Services.Authentication.User GetUser(System.Guid id) {
+      return base.Channel.GetUser(id);
+    }
+
+    public HeuristicLab.Services.Authentication.User[] GetUsers() {
+      return base.Channel.GetUsers();
+    }
+
+    public HeuristicLab.Services.Authentication.User[] GetUsersForApplication(System.Guid applicationId) {
+      return base.Channel.GetUsersForApplication(applicationId);
+    }
+
+    public System.Guid AddUser(HeuristicLab.Services.Authentication.User user) {
+      return base.Channel.AddUser(user);
+    }
+
+    public void DeleteUser(System.Guid id) {
+      base.Channel.DeleteUser(id);
+    }
+
+    public void UpdateUser(HeuristicLab.Services.Authentication.User user) {
+      base.Channel.UpdateUser(user);
+    }
+
+    public void AddUserToRole(System.Guid roleId, System.Guid userId) {
+      base.Channel.AddUserToRole(roleId, userId);
+    }
+
+    public System.Guid[] GetUsersInRole(System.Guid roleId) {
+      return base.Channel.GetUsersInRole(roleId);
+    }
+
+    public void RemoveUserFromRole(System.Guid roleId, System.Guid userId) {
+      base.Channel.RemoveUserFromRole(roleId, userId);
+    }
+
+    public bool IsUserInRole(System.Guid userId, System.Guid roleId) {
+      return base.Channel.IsUserInRole(userId, roleId);
+    }
+
+    public HeuristicLab.Services.Authentication.User ResetPassword(string applicationName, string userName, string password) {
+      return base.Channel.ResetPassword(applicationName, userName, password);
+    }
+
+    public HeuristicLab.Services.Authentication.Role GetRole(System.Guid id) {
+      return base.Channel.GetRole(id);
+    }
+
+    public HeuristicLab.Services.Authentication.Role[] GetRoles() {
+      return base.Channel.GetRoles();
+    }
+
+    public HeuristicLab.Services.Authentication.Role[] GetRolesForApplication(System.Guid applicationId) {
+      return base.Channel.GetRolesForApplication(applicationId);
+    }
+
+    public System.Guid AddRole(HeuristicLab.Services.Authentication.Role role) {
+      return base.Channel.AddRole(role);
+    }
+
+    public void UpdateRole(HeuristicLab.Services.Authentication.Role role) {
+      base.Channel.UpdateRole(role);
+    }
+
+    public void DeleteRole(System.Guid id) {
+      base.Channel.DeleteRole(id);
+    }
+
+    public System.Guid[] GetRolesForUser(System.Guid userId) {
+      return base.Channel.GetRolesForUser(userId);
+    }
+
+    public HeuristicLab.Services.Authentication.Application GetApplication(System.Guid id) {
+      return base.Channel.GetApplication(id);
+    }
+
+    public System.Guid AddApplication(HeuristicLab.Services.Authentication.Application application) {
+      return base.Channel.AddApplication(application);
+    }
+
+    public void DeleteApplication(System.Guid id) {
+      base.Channel.DeleteApplication(id);
+    }
+
+    public HeuristicLab.Services.Authentication.Application[] GetApplications() {
+      return base.Channel.GetApplications();
+    }
+
+    public void UpdateApplication(HeuristicLab.Services.Authentication.Application application) {
+      base.Channel.UpdateApplication(application);
+    }
+  }
 }

branches/UserManagement/HeuristicLab.Services.Authentication.ServiceClients/ServiceClients/Role.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab 
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * 
+ * This file is part of HeuristicLab. 
+ * 
+ * HeuristicLab is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * HeuristicLab is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 
+ */
+#endregion
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using HeuristicLab.Core;
+using HeuristicLab.Common;
 
-namespace HeuristicLab.Services.Authentication
-{
-    public partial class Role
-    {
+namespace HeuristicLab.Services.Authentication {
+  [Item("Role", "A role.")]
+  public partial class Role {
+    protected Role(Role original, Cloner cloner)
+      : base(original, cloner) {
 
-        //  IEnumerable<User> Users;
+      ApplicationId = original.ApplicationId;
+    }
 
+    public Role() {
     }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Role(this, cloner);
+    }
+  }
 }

branches/UserManagement/HeuristicLab.Services.Authentication.ServiceClients/ServiceClients/User.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab 
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * 
+ * This file is part of HeuristicLab. 
+ * 
+ * HeuristicLab is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ *                                                    d
+ * HeuristicLab is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 
+ */
+#endregion
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using HeuristicLab.Core;
+using HeuristicLab.Common;
 
-namespace HeuristicLab.Services.Authentication
-{
-    public partial class User
-    {
-        // IEnumerable<Role> Roles
+namespace HeuristicLab.Services.Authentication {
+  [Item("User", "An user.")]
+  public partial class User {
+    protected User(User original, Cloner cloner)
+      : base(original, cloner) {
 
+      ApplicationId = original.ApplicationId;
+      Email = original.Email;
+      IsApproved = original.IsApproved;
+      CreateDate = original.CreateDate;
+      LastLoginDate = original.LastLoginDate;
+      LastLockoutDate = original.LastLockoutDate;
     }
+
+    public User() {
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new User(this, cloner);
+    }
+  }
 }

branches/UserManagement/HeuristicLab.Services.Authentication.ServiceClients/app.config

@@ -29 +29 @@
                 name="WSHttpBinding_IAuthenticationService">
                 <identity>
-                    <certificate encodedValue="AwAAAAEAAAAUAAAAXL2k/dCMiB3+7a8y6zepgAUMPdcgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhB0J9LOt5NHpkN1DGclpr/0MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDkyMTE4MDIwN1oXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC73VKB25OrytpquyozHwo7d711Z4KEQEWHIigtJufMBUIzpQWXQrySaYrOdjZxuDJE8M7+kUi6FJny3o48Z8ZEEIKdoy4fJ+o5+rXKKNyg3rZxae1KJm4kQ3rIRu68b3cu6EYvFymORNo+gv8A03IbA2F7K1vaQbuRDAdbP8CT+QIDAQABo0kwRzBFBgNVHQEEPjA8gBC/lrDi96sGW7ZLNecSjhFEoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghB0J9LOt5NHpkN1DGclpr/0MAkGBSsOAwIdBQADgYEAdls1HmJKAhEUZvCcg/ELZYpRHF3ds5mHsYrNNhEoUTrHYJzsXDqxLMyn9nbKQHv+kBH7tdgF61agYvy3666D7EHPMXyEk6OwCVxIvOyNaHywS0v7/fyU/394VpzFNmkuycaiemEZFhqxstKN6n4PzBqOJfUmIE9Ry/mnlp6T2Zo=" />
+                    <certificate encodedValue="AwAAAAEAAAAUAAAAcW5qweN5KE/c7vDfiOgOVK9MmdUgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBNYVKrw/XEtUXaCrJWdRQ3MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTIxMDEyNDEzOFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDcDRvCjtxUsUVe09hYQopTYzqvWEkVmwQhm3L/ZsYL5OXzfmGlT7/sL5SzWzlWrdDIMjW/H65bR50IxvgZ3B/N7x5jnvaV9wIH3000XYHMxKLoTzhths7OjU0uFHnQcI4mzhm6WralCag/wonW5T36pW8s2PixqUBecZZw0hBlbwIDAQABo0kwRzBFBgNVHQEEPjA8gBDjWp8J1q9QALL3wjJ/Q0j5oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBNYVKrw/XEtUXaCrJWdRQ3MAkGBSsOAwIdBQADgYEADaAsqAYk9qAuzyzkG6i2dCo1lOFuwKobPDzFJ7i3DvIeG8M9b+3JonFJiHItHEG2la82m+kCwV/uedicGdonSzG2WJwh3RqZq6CAlw8mz883npGD0w119XADxSZy+X4Tg6qrePVtWyH2MnKUMb7UTtwgRMhJrrdweP+ysdyue0o=" />
                 </identity>
             </endpoint>

branches/UserManagement/HeuristicLab.Services.Authentication.TestClient2/HeuristicLab.Services.Authentication.TestClient2.csproj

@@ -14 +14 @@
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -38 +53 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Collections-3.3">
+      <HintPath>..\HeuristicLab.Collections-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Common-3.3">
+      <HintPath>..\HeuristicLab.Common-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Core-3.3">
+      <HintPath>..\HeuristicLab.Core-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -51 +75 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Form1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="UserManagement.cs">
       <SubType>Form</SubType>
@@ -81 +104 @@
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <EmbeddedResource Include="UserManagement.resx">
@@ -98 +122 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 Client Profile %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/UserManagement/HeuristicLab.Services.Authentication.TestClient2/Program.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab 
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * 
+ * This file is part of HeuristicLab. 
+ * 
+ * HeuristicLab is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * HeuristicLab is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 
+ */
+#endregion
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -6 +26 @@
 using HeuristicLab.Services.Authentication;
 using System.ServiceModel.Security;
-using HeuristicLab.Services.Authentication.ServiceClients;
+
 
 namespace HeuristicLab.Services.Authentication.TestClient2
@@ -14 +34 @@
         static void Main(string[] args)
         {
-            IEnumerable<Application> apps = AuthenticationClient.Instance.Applications;
-
-            foreach (Application app in apps)
-            {
-                Console.WriteLine(app.Name);
-            }
-            Console.WriteLine("          Users         ");
-            IEnumerable<User> users = AuthenticationClient.Instance.Users;
-
-            foreach (User u in users) {
-              Console.WriteLine(u.Name);
-            }
-            Console.ReadLine();  
-
-            System.Windows.Forms.Application.Run(new Form1());
+            UserManagement formUserMgmt = new UserManagement();
+            System.Windows.Forms.Application.Run(formUserMgmt);
         }
     }

branches/UserManagement/HeuristicLab.Services.Authentication.TestClient2/UserManagement.Designer.cs

@@ -1 @@
-namespace HeuristicLab.Services.Authentication.TestClient2
+#region License Information
+/* HeuristicLab 
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * 
+ * This file is part of HeuristicLab. 
+ * 
+ * HeuristicLab is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * HeuristicLab is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 
+ */
+#endregion
+namespace HeuristicLab.Services.Authentication
 {
     partial class UserManagement
@@ -29 +49 @@
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.Label descriptionLabel;
-            System.Windows.Forms.Label loweredApplicationNameLabel;
-            System.Windows.Forms.Label nameLabel;
-            System.Windows.Forms.Label commentLabel;
-            System.Windows.Forms.Label emailLabel;
-            System.Windows.Forms.Label isApprovedLabel;
-            System.Windows.Forms.Label nameLabel1;
-            System.Windows.Forms.Label passwordLabel;
-            System.Windows.Forms.Label passwordSaltLabel;
-            System.Windows.Forms.Label nameLabel2;
-            System.Windows.Forms.Label loweredRoleNameLabel;
-            System.Windows.Forms.Label descriptionLabel1;
-            this.tcMain = new System.Windows.Forms.TabControl();
-            this.tpApplications = new System.Windows.Forms.TabPage();
-            this.btnUpdateApplication = new System.Windows.Forms.Button();
-            this.btnDeleteApplication = new System.Windows.Forms.Button();
-            this.descriptionTextBox = new System.Windows.Forms.TextBox();
-            this.bsApplications = new System.Windows.Forms.BindingSource(this.components);
-            this.loweredApplicationNameTextBox = new System.Windows.Forms.TextBox();
-            this.nameTextBox = new System.Windows.Forms.TextBox();
-            this.btnNewApplication = new System.Windows.Forms.Button();
-            this.dgvApplications = new System.Windows.Forms.DataGridView();
-            this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.loweredApplicationNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.descriptionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.tpUsers = new System.Windows.Forms.TabPage();
-            this.tcUser = new System.Windows.Forms.TabControl();
-            this.tabPage1 = new System.Windows.Forms.TabPage();
-            this.passwordTextBox = new System.Windows.Forms.TextBox();
-            this.bsUsers = new System.Windows.Forms.BindingSource(this.components);
-            this.isApprovedCheckBox = new System.Windows.Forms.CheckBox();
-            this.btnUpdateUser = new System.Windows.Forms.Button();
-            this.commentTextBox = new System.Windows.Forms.TextBox();
-            this.btnDeleteUser = new System.Windows.Forms.Button();
-            this.btnNewUser = new System.Windows.Forms.Button();
-            this.emailTextBox = new System.Windows.Forms.TextBox();
-            this.passwordSaltTextBox = new System.Windows.Forms.TextBox();
-            this.nameTextBox1 = new System.Windows.Forms.TextBox();
-            this.tabPage2 = new System.Windows.Forms.TabPage();
-            this.btnAddRoleToUser = new System.Windows.Forms.Button();
-            this.btnRemoveRoleFromUser = new System.Windows.Forms.Button();
-            this.dgvUserRolesAll = new System.Windows.Forms.DataGridView();
-            this.nameDataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bsRoles = new System.Windows.Forms.BindingSource(this.components);
-            this.dgvUserRoles = new System.Windows.Forms.DataGridView();
-            this.nameDataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bsUserRoles = new System.Windows.Forms.BindingSource(this.components);
-            this.dgvUsers = new System.Windows.Forms.DataGridView();
-            this.nameDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.emailDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.commentDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lastLoginDateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lastPasswordChangeDateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lastLockoutDateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lastActivityDateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.isLookedOutDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.isApprovedDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.tpRoles = new System.Windows.Forms.TabPage();
-            this.tcRole = new System.Windows.Forms.TabControl();
-            this.tabPage3 = new System.Windows.Forms.TabPage();
-            this.btnNewRole = new System.Windows.Forms.Button();
-            this.btnUpdateRole = new System.Windows.Forms.Button();
-            this.descriptionTextBox1 = new System.Windows.Forms.TextBox();
-            this.btnDeleteRole = new System.Windows.Forms.Button();
-            this.loweredRoleNameTextBox = new System.Windows.Forms.TextBox();
-            this.nameTextBox2 = new System.Windows.Forms.TextBox();
-            this.tabPage4 = new System.Windows.Forms.TabPage();
-            this.btnAddUserToRole = new System.Windows.Forms.Button();
-            this.btnRemoveUserFromRole = new System.Windows.Forms.Button();
-            this.dgvRoleUsersAll = new System.Windows.Forms.DataGridView();
-            this.nameDataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dgvRoleUsers = new System.Windows.Forms.DataGridView();
-            this.nameDataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bsRoleUsers = new System.Windows.Forms.BindingSource(this.components);
-            this.dgvRoles = new System.Windows.Forms.DataGridView();
-            this.nameDataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.loweredRoleNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.descriptionDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cbxApplications = new System.Windows.Forms.ComboBox();
-            this.bsApplicationsCombo = new System.Windows.Forms.BindingSource(this.components);
-            descriptionLabel = new System.Windows.Forms.Label();
-            loweredApplicationNameLabel = new System.Windows.Forms.Label();
-            nameLabel = new System.Windows.Forms.Label();
-            commentLabel = new System.Windows.Forms.Label();
-            emailLabel = new System.Windows.Forms.Label();
-            isApprovedLabel = new System.Windows.Forms.Label();
-            nameLabel1 = new System.Windows.Forms.Label();
-            passwordLabel = new System.Windows.Forms.Label();
-            passwordSaltLabel = new System.Windows.Forms.Label();
-            nameLabel2 = new System.Windows.Forms.Label();
-            loweredRoleNameLabel = new System.Windows.Forms.Label();
-            descriptionLabel1 = new System.Windows.Forms.Label();
-            this.tcMain.SuspendLayout();
-            this.tpApplications.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.bsApplications)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvApplications)).BeginInit();
-            this.tpUsers.SuspendLayout();
-            this.tcUser.SuspendLayout();
-            this.tabPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.bsUsers)).BeginInit();
-            this.tabPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvUserRolesAll)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsRoles)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvUserRoles)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsUserRoles)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvUsers)).BeginInit();
-            this.tpRoles.SuspendLayout();
-            this.tcRole.SuspendLayout();
-            this.tabPage3.SuspendLayout();
-            this.tabPage4.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvRoleUsersAll)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvRoleUsers)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsRoleUsers)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvRoles)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsApplicationsCombo)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // descriptionLabel
-            // 
-            descriptionLabel.AutoSize = true;
-            descriptionLabel.Location = new System.Drawing.Point(510, 237);
-            descriptionLabel.Name = "descriptionLabel";
-            descriptionLabel.Size = new System.Drawing.Size(63, 13);
-            descriptionLabel.TabIndex = 2;
-            descriptionLabel.Text = "Description:";
-            // 
-            // loweredApplicationNameLabel
-            // 
-            loweredApplicationNameLabel.AutoSize = true;
-            loweredApplicationNameLabel.Location = new System.Drawing.Point(333, 237);
-            loweredApplicationNameLabel.Name = "loweredApplicationNameLabel";
-            loweredApplicationNameLabel.Size = new System.Drawing.Size(137, 13);
-            loweredApplicationNameLabel.TabIndex = 6;
-            loweredApplicationNameLabel.Text = "Lowered Application Name:";
-            // 
-            // nameLabel
-            // 
-            nameLabel.AutoSize = true;
-            nameLabel.Location = new System.Drawing.Point(160, 237);
-            nameLabel.Name = "nameLabel";
-            nameLabel.Size = new System.Drawing.Size(38, 13);
-            nameLabel.TabIndex = 8;
-            nameLabel.Text = "Name:";
-            // 
-            // commentLabel
-            // 
-            commentLabel.AutoSize = true;
-            commentLabel.Location = new System.Drawing.Point(28, 16);
-            commentLabel.Name = "commentLabel";
-            commentLabel.Size = new System.Drawing.Size(54, 13);
-            commentLabel.TabIndex = 1;
-            commentLabel.Text = "Comment:";
-            // 
-            // emailLabel
-            // 
-            emailLabel.AutoSize = true;
-            emailLabel.Location = new System.Drawing.Point(28, 64);
-            emailLabel.Name = "emailLabel";
-            emailLabel.Size = new System.Drawing.Size(35, 13);
-            emailLabel.TabIndex = 3;
-            emailLabel.Text = "Email:";
-            // 
-            // isApprovedLabel
-            // 
-            isApprovedLabel.AutoSize = true;
-            isApprovedLabel.Location = new System.Drawing.Point(28, 113);
-            isApprovedLabel.Name = "isApprovedLabel";
-            isApprovedLabel.Size = new System.Drawing.Size(67, 13);
-            isApprovedLabel.TabIndex = 5;
-            isApprovedLabel.Text = "Is Approved:";
-            // 
-            // nameLabel1
-            // 
-            nameLabel1.AutoSize = true;
-            nameLabel1.Location = new System.Drawing.Point(201, 16);
-            nameLabel1.Name = "nameLabel1";
-            nameLabel1.Size = new System.Drawing.Size(38, 13);
-            nameLabel1.TabIndex = 9;
-            nameLabel1.Text = "Name:";
-            // 
-            // passwordLabel
-            // 
-            passwordLabel.AutoSize = true;
-            passwordLabel.Location = new System.Drawing.Point(201, 64);
-            passwordLabel.Name = "passwordLabel";
-            passwordLabel.Size = new System.Drawing.Size(56, 13);
-            passwordLabel.TabIndex = 11;
-            passwordLabel.Text = "Password:";
-            // 
-            // passwordSaltLabel
-            // 
-            passwordSaltLabel.AutoSize = true;
-            passwordSaltLabel.Location = new System.Drawing.Point(335, 64);
-            passwordSaltLabel.Name = "passwordSaltLabel";
-            passwordSaltLabel.Size = new System.Drawing.Size(77, 13);
-            passwordSaltLabel.TabIndex = 13;
-            passwordSaltLabel.Text = "Password Salt:";
-            // 
-            // nameLabel2
-            // 
-            nameLabel2.AutoSize = true;
-            nameLabel2.Location = new System.Drawing.Point(41, 26);
-            nameLabel2.Name = "nameLabel2";
-            nameLabel2.Size = new System.Drawing.Size(38, 13);
-            nameLabel2.TabIndex = 1;
-            nameLabel2.Text = "Name:";
-            // 
-            // loweredRoleNameLabel
-            // 
-            loweredRoleNameLabel.AutoSize = true;
-            loweredRoleNameLabel.Location = new System.Drawing.Point(41, 78);
-            loweredRoleNameLabel.Name = "loweredRoleNameLabel";
-            loweredRoleNameLabel.Size = new System.Drawing.Size(107, 13);
-            loweredRoleNameLabel.TabIndex = 3;
-            loweredRoleNameLabel.Text = "Lowered Role Name:";
-            // 
-            // descriptionLabel1
-            // 
-            descriptionLabel1.AutoSize = true;
-            descriptionLabel1.Location = new System.Drawing.Point(41, 128);
-            descriptionLabel1.Name = "descriptionLabel1";
-            descriptionLabel1.Size = new System.Drawing.Size(63, 13);
-            descriptionLabel1.TabIndex = 5;
-            descriptionLabel1.Text = "Description:";
-            // 
-            // tcMain
-            // 
-            this.tcMain.Controls.Add(this.tpApplications);
-            this.tcMain.Controls.Add(this.tpUsers);
-            this.tcMain.Controls.Add(this.tpRoles);
-            this.tcMain.Location = new System.Drawing.Point(31, 63);
-            this.tcMain.Name = "tcMain";
-            this.tcMain.SelectedIndex = 0;
-            this.tcMain.Size = new System.Drawing.Size(829, 556);
-            this.tcMain.TabIndex = 0;
-            // 
-            // tpApplications
-            // 
-            this.tpApplications.AutoScroll = true;
-            this.tpApplications.Controls.Add(this.btnUpdateApplication);
-            this.tpApplications.Controls.Add(this.btnDeleteApplication);
-            this.tpApplications.Controls.Add(descriptionLabel);
-            this.tpApplications.Controls.Add(this.descriptionTextBox);
-            this.tpApplications.Controls.Add(loweredApplicationNameLabel);
-            this.tpApplications.Controls.Add(this.loweredApplicationNameTextBox);
-            this.tpApplications.Controls.Add(nameLabel);
-            this.tpApplications.Controls.Add(this.nameTextBox);
-            this.tpApplications.Controls.Add(this.btnNewApplication);
-            this.tpApplications.Controls.Add(this.dgvApplications);
-            this.tpApplications.Location = new System.Drawing.Point(4, 22);
-            this.tpApplications.Name = "tpApplications";
-            this.tpApplications.Padding = new System.Windows.Forms.Padding(3);
-            this.tpApplications.Size = new System.Drawing.Size(821, 530);
-            this.tpApplications.TabIndex = 0;
-            this.tpApplications.Text = "Applications";
-            this.tpApplications.UseVisualStyleBackColor = true;
-            // 
-            // btnUpdateApplication
-            // 
-            this.btnUpdateApplication.Location = new System.Drawing.Point(23, 309);
-            this.btnUpdateApplication.Name = "btnUpdateApplication";
-            this.btnUpdateApplication.Size = new System.Drawing.Size(75, 23);
-            this.btnUpdateApplication.TabIndex = 11;
-            this.btnUpdateApplication.Text = "update";
-            this.btnUpdateApplication.UseVisualStyleBackColor = true;
-            this.btnUpdateApplication.Click += new System.EventHandler(this.btnUpdateApplication_Click);
-            // 
-            // btnDeleteApplication
-            // 
-            this.btnDeleteApplication.Location = new System.Drawing.Point(23, 280);
-            this.btnDeleteApplication.Name = "btnDeleteApplication";
-            this.btnDeleteApplication.Size = new System.Drawing.Size(75, 23);
-            this.btnDeleteApplication.TabIndex = 10;
-            this.btnDeleteApplication.Text = "delete";
-            this.btnDeleteApplication.UseVisualStyleBackColor = true;
-            this.btnDeleteApplication.Click += new System.EventHandler(this.btnDeleteApplication_Click);
-            // 
-            // descriptionTextBox
-            // 
-            this.descriptionTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsApplications, "Description", true));
-            this.descriptionTextBox.Location = new System.Drawing.Point(513, 253);
-            this.descriptionTextBox.Name = "descriptionTextBox";
-            this.descriptionTextBox.Size = new System.Drawing.Size(152, 20);
-            this.descriptionTextBox.TabIndex = 3;
-            // 
-            // bsApplications
-            // 
-            this.bsApplications.DataSource = typeof(HeuristicLab.Services.Authentication.DataTransfer.Application);
-            // 
-            // loweredApplicationNameTextBox
-            // 
-            this.loweredApplicationNameTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsApplications, "LoweredApplicationName", true));
-            this.loweredApplicationNameTextBox.Location = new System.Drawing.Point(336, 253);
-            this.loweredApplicationNameTextBox.Name = "loweredApplicationNameTextBox";
-            this.loweredApplicationNameTextBox.Size = new System.Drawing.Size(152, 20);
-            this.loweredApplicationNameTextBox.TabIndex = 7;
-            // 
-            // nameTextBox
-            // 
-            this.nameTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsApplications, "Name", true));
-            this.nameTextBox.Location = new System.Drawing.Point(163, 253);
-            this.nameTextBox.Name = "nameTextBox";
-            this.nameTextBox.Size = new System.Drawing.Size(152, 20);
-            this.nameTextBox.TabIndex = 9;
-            // 
-            // btnNewApplication
-            // 
-            this.btnNewApplication.Location = new System.Drawing.Point(23, 251);
-            this.btnNewApplication.Name = "btnNewApplication";
-            this.btnNewApplication.Size = new System.Drawing.Size(75, 23);
-            this.btnNewApplication.TabIndex = 1;
-            this.btnNewApplication.Text = "new";
-            this.btnNewApplication.UseVisualStyleBackColor = true;
-            this.btnNewApplication.Click += new System.EventHandler(this.btnNewApplication_Click);
-            // 
-            // dgvApplications
-            // 
-            this.dgvApplications.AllowUserToAddRows = false;
-            this.dgvApplications.AllowUserToDeleteRows = false;
-            this.dgvApplications.AutoGenerateColumns = false;
-            this.dgvApplications.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dgvApplications.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+          this.components = new System.ComponentModel.Container();
+          System.Windows.Forms.Label descriptionLabel;
+          System.Windows.Forms.Label nameLabel;
+          System.Windows.Forms.Label commentLabel;
+          System.Windows.Forms.Label emailLabel;
+          System.Windows.Forms.Label nameLabel1;
+          System.Windows.Forms.Label nameLabel2;
+          System.Windows.Forms.Label descriptionLabel1;
+          System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UserManagement));
+          System.Windows.Forms.Label label2;
+          this.tcMain = new System.Windows.Forms.TabControl();
+          this.tpApplications = new System.Windows.Forms.TabPage();
+          this.dgvApplications = new System.Windows.Forms.DataGridView();
+          this.idDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+          this.colName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+          this.colDescription = new System.Windows.Forms.DataGridViewTextBoxColumn();
+          this.applicationBindingSource = new System.Windows.Forms.BindingSource(this.components);
+          this.panel1 = new System.Windows.Forms.Panel();
+          this.tbApplicationDescription = new System.Windows.Forms.TextBox();
+          this.tbApplicationName = new System.Windows.Forms.TextBox();
+          this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+          this.tssApplicationStatus = new System.Windows.Forms.ToolStripStatusLabel();
+          this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+          this.tspNewApplication = new System.Windows.Forms.ToolStripButton();
+          this.tspDeleteApplication = new System.Windows.Forms.ToolStripButton();
+          this.tspSaveApplication = new System.Windows.Forms.ToolStripButton();
+          this.tpUsers = new System.Windows.Forms.TabPage();
+          this.dgvUsers = new System.Windows.Forms.DataGridView();
+          this.idDataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+          this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+          this.emailDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+          this.descriptionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+          this.userBindingSource2 = new System.Windows.Forms.BindingSource(this.components);
+          this.toolStrip2 = new System.Windows.Forms.ToolStrip();
+          this.tsbNewUser = new System.Windows.Forms.ToolStripButton();
+          this.tsbDeleteUser = new System.Windows.Forms.ToolStripButton();
+          this.tsbSaveUser = new System.Windows.Forms.ToolStripButton();
+          this.panel3 = new System.Windows.Forms.Panel();
+          this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+          this.panel4 = new System.Windows.Forms.Panel();
+          this.dgvUserRoles = new System.Windows.Forms.DataGridView();
+          this.nameDataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+          this.roleBindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+          this.toolStrip3 = new System.Windows.Forms.ToolStrip();
+          this.tsbRemoveRoleFromUser = new System.Windows.Forms.ToolStripButton();
+          this.panel5 = new System.Windows.Forms.Panel();
+          this.dgvUserRolesAll = new System.Windows.Forms.DataGridView();
+          this.nameDataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+          this.roleBindingSource2 = new System.Windows.Forms.BindingSource(this.components);
+          this.toolStrip4 = new System.Windows.Forms.ToolStrip();
+          this.tsbAddRoleToUser = new System.Windows.Forms.ToolStripButton();
+          this.label3 = new System.Windows.Forms.Label();
+          this.tbUserComment = new System.Windows.Forms.TextBox();
+          this.tbUserName = new System.Windows.Forms.TextBox();
+          this.tbUserEmail = new System.Windows.Forms.TextBox();
+          this.statusStrip2 = new System.Windows.Forms.StatusStrip();
+          this.tssStatusUser = new System.Windows.Forms.ToolStripStatusLabel();
+          this.tpRoles = new System.Windows.Forms.TabPage();
+          this.dgvRoles = new System.Windows.Forms.DataGridView();
+          this.idDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+          this.nameDataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+          this.descriptionDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+          this.roleBindingSource = new System.Windows.Forms.BindingSource(this.components);
+          this.panel6 = new System.Windows.Forms.Panel();
+          this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
+          this.panel8 = new System.Windows.Forms.Panel();
+          this.dgvRoleUsersAll = new System.Windows.Forms.DataGridView();
+          this.nameDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+          this.userBindingSource = new System.Windows.Forms.BindingSource(this.components);
+          this.toolStrip7 = new System.Windows.Forms.ToolStrip();
+          this.tsbAddUserToRole = new System.Windows.Forms.ToolStripButton();
+          this.panel7 = new System.Windows.Forms.Panel();
+          this.dgvRoleUsers = new System.Windows.Forms.DataGridView();
+          this.nameDataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+          this.userBindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+          this.toolStrip6 = new System.Windows.Forms.ToolStrip();
+          this.tsbRemoveUserFromRole = new System.Windows.Forms.ToolStripButton();
+          this.tbRoleName = new System.Windows.Forms.TextBox();
+          this.tbRoleDescription = new System.Windows.Forms.TextBox();
+          this.statusStrip3 = new System.Windows.Forms.StatusStrip();
+          this.tssStatusRole = new System.Windows.Forms.ToolStripStatusLabel();
+          this.toolStrip5 = new System.Windows.Forms.ToolStrip();
+          this.tspNewRole = new System.Windows.Forms.ToolStripButton();
+          this.tsbDeleteRole = new System.Windows.Forms.ToolStripButton();
+          this.tsbSaveRole = new System.Windows.Forms.ToolStripButton();
+          this.cbxApplications = new System.Windows.Forms.ComboBox();
+          this.label1 = new System.Windows.Forms.Label();
+          this.panel2 = new System.Windows.Forms.Panel();
+          this.gbResetPassword = new System.Windows.Forms.GroupBox();
+          this.btnResetPassword = new System.Windows.Forms.Button();
+          this.tbPassword = new System.Windows.Forms.TextBox();
+          descriptionLabel = new System.Windows.Forms.Label();
+          nameLabel = new System.Windows.Forms.Label();
+          commentLabel = new System.Windows.Forms.Label();
+          emailLabel = new System.Windows.Forms.Label();
+          nameLabel1 = new System.Windows.Forms.Label();
+          nameLabel2 = new System.Windows.Forms.Label();
+          descriptionLabel1 = new System.Windows.Forms.Label();
+          label2 = new System.Windows.Forms.Label();
+          this.tcMain.SuspendLayout();
+          this.tpApplications.SuspendLayout();
+          ((System.ComponentModel.ISupportInitialize)(this.dgvApplications)).BeginInit();
+          ((System.ComponentModel.ISupportInitialize)(this.applicationBindingSource)).BeginInit();
+          this.panel1.SuspendLayout();
+          this.statusStrip1.SuspendLayout();
+          this.toolStrip1.SuspendLayout();
+          this.tpUsers.SuspendLayout();
+          ((System.ComponentModel.ISupportInitialize)(this.dgvUsers)).BeginInit();
+          ((System.ComponentModel.ISupportInitialize)(this.userBindingSource2)).BeginInit();
+          this.toolStrip2.SuspendLayout();
+          this.panel3.SuspendLayout();
+          this.tableLayoutPanel1.SuspendLayout();
+          this.panel4.SuspendLayout();
+          ((System.ComponentModel.ISupportInitialize)(this.dgvUserRoles)).BeginInit();
+          ((System.ComponentModel.ISupportInitialize)(this.roleBindingSource1)).BeginInit();
+          this.toolStrip3.SuspendLayout();
+          this.panel5.SuspendLayout();
+          ((System.ComponentModel.ISupportInitialize)(this.dgvUserRolesAll)).BeginInit();
+          ((System.ComponentModel.ISupportInitialize)(this.roleBindingSource2)).BeginInit();
+          this.toolStrip4.SuspendLayout();
+          this.statusStrip2.SuspendLayout();
+          this.tpRoles.SuspendLayout();
+          ((System.ComponentModel.ISupportInitialize)(this.dgvRoles)).BeginInit();
+          ((System.ComponentModel.ISupportInitialize)(this.roleBindingSource)).BeginInit();
+          this.panel6.SuspendLayout();
+          this.tableLayoutPanel2.SuspendLayout();
+          this.panel8.SuspendLayout();
+          ((System.ComponentModel.ISupportInitialize)(this.dgvRoleUsersAll)).BeginInit();
+          ((System.ComponentModel.ISupportInitialize)(this.userBindingSource)).BeginInit();
+          this.toolStrip7.SuspendLayout();
+          this.panel7.SuspendLayout();
+          ((System.ComponentModel.ISupportInitialize)(this.dgvRoleUsers)).BeginInit();
+          ((System.ComponentModel.ISupportInitialize)(this.userBindingSource1)).BeginInit();
+          this.toolStrip6.SuspendLayout();
+          this.statusStrip3.SuspendLayout();
+          this.toolStrip5.SuspendLayout();
+          this.panel2.SuspendLayout();
+          this.gbResetPassword.SuspendLayout();
+          this.SuspendLayout();
+          // 
+          // descriptionLabel
+          // 
+          descriptionLabel.AutoSize = true;
+          descriptionLabel.Location = new System.Drawing.Point(21, 73);
+          descriptionLabel.Name = "descriptionLabel";
+          descriptionLabel.Size = new System.Drawing.Size(63, 13);
+          descriptionLabel.TabIndex = 2;
+          descriptionLabel.Text = "Description:";
+          // 
+          // nameLabel
+          // 
+          nameLabel.AutoSize = true;
+          nameLabel.Location = new System.Drawing.Point(21, 23);
+          nameLabel.Name = "nameLabel";
+          nameLabel.Size = new System.Drawing.Size(38, 13);
+          nameLabel.TabIndex = 8;
+          nameLabel.Text = "Name:";
+          // 
+          // commentLabel
+          // 
+          commentLabel.AutoSize = true;
+          commentLabel.Location = new System.Drawing.Point(15, 18);
+          commentLabel.Name = "commentLabel";
+          commentLabel.Size = new System.Drawing.Size(63, 13);
+          commentLabel.TabIndex = 1;
+          commentLabel.Text = "Description:";
+          // 
+          // emailLabel
+          // 
+          emailLabel.AutoSize = true;
+          emailLabel.Location = new System.Drawing.Point(320, 18);
+          emailLabel.Name = "emailLabel";
+          emailLabel.Size = new System.Drawing.Size(35, 13);
+          emailLabel.TabIndex = 3;
+          emailLabel.Text = "Email:";
+          // 
+          // nameLabel1
+          // 
+          nameLabel1.AutoSize = true;
+          nameLabel1.Location = new System.Drawing.Point(160, 18);
+          nameLabel1.Name = "nameLabel1";
+          nameLabel1.Size = new System.Drawing.Size(38, 13);
+          nameLabel1.TabIndex = 9;
+          nameLabel1.Text = "Name:";
+          // 
+          // nameLabel2
+          // 
+          nameLabel2.AutoSize = true;
+          nameLabel2.Location = new System.Drawing.Point(24, 12);
+          nameLabel2.Name = "nameLabel2";
+          nameLabel2.Size = new System.Drawing.Size(38, 13);
+          nameLabel2.TabIndex = 1;
+          nameLabel2.Text = "Name:";
+          // 
+          // descriptionLabel1
+          // 
+          descriptionLabel1.AutoSize = true;
+          descriptionLabel1.Location = new System.Drawing.Point(214, 12);
+          descriptionLabel1.Name = "descriptionLabel1";
+          descriptionLabel1.Size = new System.Drawing.Size(63, 13);
+          descriptionLabel1.TabIndex = 5;
+          descriptionLabel1.Text = "Description:";
+          // 
+          // tcMain
+          // 
+          this.tcMain.Controls.Add(this.tpApplications);
+          this.tcMain.Controls.Add(this.tpUsers);
+          this.tcMain.Controls.Add(this.tpRoles);
+          this.tcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+          this.tcMain.Location = new System.Drawing.Point(0, 33);
+          this.tcMain.Name = "tcMain";
+          this.tcMain.SelectedIndex = 0;
+          this.tcMain.Size = new System.Drawing.Size(1288, 647);
+          this.tcMain.TabIndex = 0;
+          // 
+          // tpApplications
+          // 
+          this.tpApplications.AutoScroll = true;
+          this.tpApplications.Controls.Add(this.dgvApplications);
+          this.tpApplications.Controls.Add(this.panel1);
+          this.tpApplications.Controls.Add(this.statusStrip1);
+          this.tpApplications.Controls.Add(this.toolStrip1);
+          this.tpApplications.Location = new System.Drawing.Point(4, 22);
+          this.tpApplications.Name = "tpApplications";
+          this.tpApplications.Padding = new System.Windows.Forms.Padding(3);
+          this.tpApplications.Size = new System.Drawing.Size(1280, 621);
+          this.tpApplications.TabIndex = 0;
+          this.tpApplications.Text = "Applications";
+          this.tpApplications.UseVisualStyleBackColor = true;
+          // 
+          // dgvApplications
+          // 
+          this.dgvApplications.AllowUserToAddRows = false;
+          this.dgvApplications.AllowUserToDeleteRows = false;
+          this.dgvApplications.AutoGenerateColumns = false;
+          this.dgvApplications.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+          this.dgvApplications.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.idDataGridViewTextBoxColumn,
+            this.colName,
+            this.colDescription});
+          this.dgvApplications.DataSource = this.applicationBindingSource;
+          this.dgvApplications.Dock = System.Windows.Forms.DockStyle.Fill;
+          this.dgvApplications.Location = new System.Drawing.Point(3, 28);
+          this.dgvApplications.Name = "dgvApplications";
+          this.dgvApplications.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+          this.dgvApplications.Size = new System.Drawing.Size(1274, 381);
+          this.dgvApplications.TabIndex = 0;
+          this.dgvApplications.SelectionChanged += new System.EventHandler(this.dgvApplications_SelectionChanged);
+          // 
+          // idDataGridViewTextBoxColumn
+          // 
+          this.idDataGridViewTextBoxColumn.DataPropertyName = "Id";
+          this.idDataGridViewTextBoxColumn.HeaderText = "Id";
+          this.idDataGridViewTextBoxColumn.Name = "idDataGridViewTextBoxColumn";
+          this.idDataGridViewTextBoxColumn.Visible = false;
+          // 
+          // colName
+          // 
+          this.colName.DataPropertyName = "Name";
+          this.colName.HeaderText = "Name";
+          this.colName.Name = "colName";
+          // 
+          // colDescription
+          // 
+          this.colDescription.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+          this.colDescription.DataPropertyName = "Description";
+          this.colDescription.HeaderText = "Description";
+          this.colDescription.Name = "colDescription";
+          // 
+          // applicationBindingSource
+          // 
+          this.applicationBindingSource.DataSource = typeof(HeuristicLab.Services.Authentication.DataTransfer.Application);
+          // 
+          // panel1
+          // 
+          this.panel1.Controls.Add(this.tbApplicationDescription);
+          this.panel1.Controls.Add(this.tbApplicationName);
+          this.panel1.Controls.Add(nameLabel);
+          this.panel1.Controls.Add(descriptionLabel);
+          this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+          this.panel1.Location = new System.Drawing.Point(3, 409);
+          this.panel1.Name = "panel1";
+          this.panel1.Size = new System.Drawing.Size(1274, 187);
+          this.panel1.TabIndex = 15;
+          // 
+          // tbApplicationDescription
+          // 
+          this.tbApplicationDescription.Location = new System.Drawing.Point(24, 90);
+          this.tbApplicationDescription.Name = "tbApplicationDescription";
+          this.tbApplicationDescription.Size = new System.Drawing.Size(287, 20);
+          this.tbApplicationDescription.TabIndex = 3;
+          this.tbApplicationDescription.TextChanged += new System.EventHandler(this.tbApplicationDescription_TextChanged);
+          // 
+          // tbApplicationName
+          // 
+          this.tbApplicationName.Location = new System.Drawing.Point(24, 40);
+          this.tbApplicationName.Name = "tbApplicationName";
+          this.tbApplicationName.Size = new System.Drawing.Size(287, 20);
+          this.tbApplicationName.TabIndex = 9;
+          this.tbApplicationName.TextChanged += new System.EventHandler(this.tbApplicationName_TextChanged);
+          // 
+          // statusStrip1
+          // 
+          this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tssApplicationStatus});
+          this.statusStrip1.Location = new System.Drawing.Point(3, 596);
+          this.statusStrip1.Name = "statusStrip1";
+          this.statusStrip1.Size = new System.Drawing.Size(1274, 22);
+          this.statusStrip1.TabIndex = 14;
+          this.statusStrip1.Text = "statusStrip1";
+          // 
+          // tssApplicationStatus
+          // 
+          this.tssApplicationStatus.Name = "tssApplicationStatus";
+          this.tssApplicationStatus.Size = new System.Drawing.Size(0, 17);
+          // 
+          // toolStrip1
+          // 
+          this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tspNewApplication,
+            this.tspDeleteApplication,
+            this.tspSaveApplication});
+          this.toolStrip1.Location = new System.Drawing.Point(3, 3);
+          this.toolStrip1.Name = "toolStrip1";
+          this.toolStrip1.Size = new System.Drawing.Size(1274, 25);
+          this.toolStrip1.TabIndex = 13;
+          this.toolStrip1.Text = "toolStrip1";
+          // 
+          // tspNewApplication
+          // 
+          this.tspNewApplication.Image = ((System.Drawing.Image)(resources.GetObject("tspNewApplication.Image")));
+          this.tspNewApplication.ImageTransparentColor = System.Drawing.Color.Magenta;
+          this.tspNewApplication.Name = "tspNewApplication";
+          this.tspNewApplication.Size = new System.Drawing.Size(47, 22);
+          this.tspNewApplication.Text = "new";
+          this.tspNewApplication.Click += new System.EventHandler(this.tspNewApplication_Click);
+          // 
+          // tspDeleteApplication
+          // 
+          this.tspDeleteApplication.Image = ((System.Drawing.Image)(resources.GetObject("tspDeleteApplication.Image")));
+          this.tspDeleteApplication.ImageTransparentColor = System.Drawing.Color.Magenta;
+          this.tspDeleteApplication.Name = "tspDeleteApplication";
+          this.tspDeleteApplication.Size = new System.Drawing.Size(57, 22);
+          this.tspDeleteApplication.Text = "delete";
+          this.tspDeleteApplication.Click += new System.EventHandler(this.tspDeleteApplication_Click);
+          // 
+          // tspSaveApplication
+          // 
+          this.tspSaveApplication.Image = ((System.Drawing.Image)(resources.GetObject("tspSaveApplication.Image")));
+          this.tspSaveApplication.ImageTransparentColor = System.Drawing.Color.Magenta;
+          this.tspSaveApplication.Name = "tspSaveApplication";
+          this.tspSaveApplication.Size = new System.Drawing.Size(50, 22);
+          this.tspSaveApplication.Text = "save";
+          this.tspSaveApplication.Click += new System.EventHandler(this.tspSaveApplication_Click);
+          // 
+          // tpUsers
+          // 
+          this.tpUsers.AutoScroll = true;
+          this.tpUsers.Controls.Add(this.dgvUsers);
+          this.tpUsers.Controls.Add(this.toolStrip2);
+          this.tpUsers.Controls.Add(this.panel3);
+          this.tpUsers.Controls.Add(this.statusStrip2);
+          this.tpUsers.Location = new System.Drawing.Point(4, 22);
+          this.tpUsers.Name = "tpUsers";
+          this.tpUsers.Padding = new System.Windows.Forms.Padding(3);
+          this.tpUsers.Size = new System.Drawing.Size(1280, 621);
+          this.tpUsers.TabIndex = 1;
+          this.tpUsers.Text = "Users";
+          this.tpUsers.UseVisualStyleBackColor = true;
+          // 
+          // dgvUsers
+          // 
+          this.dgvUsers.AllowUserToAddRows = false;
+          this.dgvUsers.AllowUserToDeleteRows = false;
+          this.dgvUsers.AutoGenerateColumns = false;
+          this.dgvUsers.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+          this.dgvUsers.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.idDataGridViewTextBoxColumn2,
             this.nameDataGridViewTextBoxColumn,
-            this.loweredApplicationNameDataGridViewTextBoxColumn,
+            this.emailDataGridViewTextBoxColumn,
             this.descriptionDataGridViewTextBoxColumn});
-            this.dgvApplications.DataSource = this.bsApplications;
-            this.dgvApplications.Location = new System.Drawing.Point(6, 6);
-            this.dgvApplications.Name = "dgvApplications";
-            this.dgvApplications.Size = new System.Drawing.Size(809, 194);
-            this.dgvApplications.TabIndex = 0;
-            this.dgvApplications.SelectionChanged += new System.EventHandler(this.dgvApplications_SelectionChanged);
-            // 
-            // nameDataGridViewTextBoxColumn
-            // 
-            this.nameDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.nameDataGridViewTextBoxColumn.DataPropertyName = "Name";
-            this.nameDataGridViewTextBoxColumn.HeaderText = "Name";
-            this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn";
-            this.nameDataGridViewTextBoxColumn.Width = 60;
-            // 
-            // loweredApplicationNameDataGridViewTextBoxColumn
-            // 
-            this.loweredApplicationNameDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.loweredApplicationNameDataGridViewTextBoxColumn.DataPropertyName = "LoweredApplicationName";
-            this.loweredApplicationNameDataGridViewTextBoxColumn.HeaderText = "LoweredApplicationName";
-            this.loweredApplicationNameDataGridViewTextBoxColumn.Name = "loweredApplicationNameDataGridViewTextBoxColumn";
-            this.loweredApplicationNameDataGridViewTextBoxColumn.Width = 153;
-            // 
-            // descriptionDataGridViewTextBoxColumn
-            // 
-            this.descriptionDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.descriptionDataGridViewTextBoxColumn.DataPropertyName = "Description";
-            this.descriptionDataGridViewTextBoxColumn.HeaderText = "Description";
-            this.descriptionDataGridViewTextBoxColumn.Name = "descriptionDataGridViewTextBoxColumn";
-            this.descriptionDataGridViewTextBoxColumn.Width = 85;
-            // 
-            // tpUsers
-            // 
-            this.tpUsers.AutoScroll = true;
-            this.tpUsers.Controls.Add(this.tcUser);
-            this.tpUsers.Controls.Add(this.dgvUsers);
-            this.tpUsers.Location = new System.Drawing.Point(4, 22);
-            this.tpUsers.Name = "tpUsers";
-            this.tpUsers.Padding = new System.Windows.Forms.Padding(3);
-            this.tpUsers.Size = new System.Drawing.Size(821, 530);
-            this.tpUsers.TabIndex = 1;
-            this.tpUsers.Text = "Users";
-            this.tpUsers.UseVisualStyleBackColor = true;
-            // 
-            // tcUser
-            // 
-            this.tcUser.Controls.Add(this.tabPage1);
-            this.tcUser.Controls.Add(this.tabPage2);
-            this.tcUser.Location = new System.Drawing.Point(6, 212);
-            this.tcUser.Name = "tcUser";
-            this.tcUser.SelectedIndex = 0;
-            this.tcUser.Size = new System.Drawing.Size(809, 312);
-            this.tcUser.TabIndex = 18;
-            // 
-            // tabPage1
-            // 
-            this.tabPage1.Controls.Add(this.passwordTextBox);
-            this.tabPage1.Controls.Add(this.isApprovedCheckBox);
-            this.tabPage1.Controls.Add(this.btnUpdateUser);
-            this.tabPage1.Controls.Add(this.commentTextBox);
-            this.tabPage1.Controls.Add(this.btnDeleteUser);
-            this.tabPage1.Controls.Add(commentLabel);
-            this.tabPage1.Controls.Add(this.btnNewUser);
-            this.tabPage1.Controls.Add(this.emailTextBox);
-            this.tabPage1.Controls.Add(passwordSaltLabel);
-            this.tabPage1.Controls.Add(emailLabel);
-            this.tabPage1.Controls.Add(this.passwordSaltTextBox);
-            this.tabPage1.Controls.Add(isApprovedLabel);
-            this.tabPage1.Controls.Add(passwordLabel);
-            this.tabPage1.Controls.Add(this.nameTextBox1);
-            this.tabPage1.Controls.Add(nameLabel1);
-            this.tabPage1.Location = new System.Drawing.Point(4, 22);
-            this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(801, 286);
-            this.tabPage1.TabIndex = 0;
-            this.tabPage1.Text = "tabPage1";
-            this.tabPage1.UseVisualStyleBackColor = true;
-            // 
-            // passwordTextBox
-            // 
-            this.passwordTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsUsers, "Password", true));
-            this.passwordTextBox.Location = new System.Drawing.Point(204, 80);
-            this.passwordTextBox.Name = "passwordTextBox";
-            this.passwordTextBox.Size = new System.Drawing.Size(100, 20);
-            this.passwordTextBox.TabIndex = 12;
-            // 
-            // bsUsers
-            // 
-            this.bsUsers.DataSource = typeof(HeuristicLab.Services.Authentication.DataTransfer.User);
-            // 
-            // isApprovedCheckBox
-            // 
-            this.isApprovedCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.bsUsers, "IsApproved", true));
-            this.isApprovedCheckBox.Location = new System.Drawing.Point(114, 108);
-            this.isApprovedCheckBox.Name = "isApprovedCheckBox";
-            this.isApprovedCheckBox.Size = new System.Drawing.Size(104, 24);
-            this.isApprovedCheckBox.TabIndex = 6;
-            this.isApprovedCheckBox.Text = "checkBox1";
-            this.isApprovedCheckBox.UseVisualStyleBackColor = true;
-            // 
-            // btnUpdateUser
-            // 
-            this.btnUpdateUser.Location = new System.Drawing.Point(505, 102);
-            this.btnUpdateUser.Name = "btnUpdateUser";
-            this.btnUpdateUser.Size = new System.Drawing.Size(75, 23);
-            this.btnUpdateUser.TabIndex = 17;
-            this.btnUpdateUser.Text = "upd";
-            this.btnUpdateUser.UseVisualStyleBackColor = true;
-            this.btnUpdateUser.Click += new System.EventHandler(this.btnUpdateUser_Click);
-            // 
-            // commentTextBox
-            // 
-            this.commentTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsUsers, "Comment", true));
-            this.commentTextBox.Location = new System.Drawing.Point(31, 32);
-            this.commentTextBox.Name = "commentTextBox";
-            this.commentTextBox.Size = new System.Drawing.Size(100, 20);
-            this.commentTextBox.TabIndex = 2;
-            // 
-            // btnDeleteUser
-            // 
-            this.btnDeleteUser.Location = new System.Drawing.Point(505, 64);
-            this.btnDeleteUser.Name = "btnDeleteUser";
-            this.btnDeleteUser.Size = new System.Drawing.Size(75, 23);
-            this.btnDeleteUser.TabIndex = 16;
-            this.btnDeleteUser.Text = "del";
-            this.btnDeleteUser.UseVisualStyleBackColor = true;
-            this.btnDeleteUser.Click += new System.EventHandler(this.btnDeleteUser_Click);
-            // 
-            // btnNewUser
-            // 
-            this.btnNewUser.Location = new System.Drawing.Point(505, 28);
-            this.btnNewUser.Name = "btnNewUser";
-            this.btnNewUser.Size = new System.Drawing.Size(75, 23);
-            this.btnNewUser.TabIndex = 15;
-            this.btnNewUser.Text = "new";
-            this.btnNewUser.UseVisualStyleBackColor = true;
-            this.btnNewUser.Click += new System.EventHandler(this.btnNewUser_Click);
-            // 
-            // emailTextBox
-            // 
-            this.emailTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsUsers, "Email", true));
-            this.emailTextBox.Location = new System.Drawing.Point(31, 80);
-            this.emailTextBox.Name = "emailTextBox";
-            this.emailTextBox.Size = new System.Drawing.Size(100, 20);
-            this.emailTextBox.TabIndex = 4;
-            // 
-            // passwordSaltTextBox
-            // 
-            this.passwordSaltTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsUsers, "PasswordSalt", true));
-            this.passwordSaltTextBox.Location = new System.Drawing.Point(338, 80);
-            this.passwordSaltTextBox.Name = "passwordSaltTextBox";
-            this.passwordSaltTextBox.Size = new System.Drawing.Size(100, 20);
-            this.passwordSaltTextBox.TabIndex = 14;
-            // 
-            // nameTextBox1
-            // 
-            this.nameTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsUsers, "Name", true));
-            this.nameTextBox1.Location = new System.Drawing.Point(204, 32);
-            this.nameTextBox1.Name = "nameTextBox1";
-            this.nameTextBox1.Size = new System.Drawing.Size(100, 20);
-            this.nameTextBox1.TabIndex = 10;
-            // 
-            // tabPage2
-            // 
-            this.tabPage2.Controls.Add(this.btnAddRoleToUser);
-            this.tabPage2.Controls.Add(this.btnRemoveRoleFromUser);
-            this.tabPage2.Controls.Add(this.dgvUserRolesAll);
-            this.tabPage2.Controls.Add(this.dgvUserRoles);
-            this.tabPage2.Location = new System.Drawing.Point(4, 22);
-            this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(801, 286);
-            this.tabPage2.TabIndex = 1;
-            this.tabPage2.Text = "tabPage2";
-            this.tabPage2.UseVisualStyleBackColor = true;
-            // 
-            // btnAddRoleToUser
-            // 
-            this.btnAddRoleToUser.Location = new System.Drawing.Point(463, 24);
-            this.btnAddRoleToUser.Name = "btnAddRoleToUser";
-            this.btnAddRoleToUser.Size = new System.Drawing.Size(75, 23);
-            this.btnAddRoleToUser.TabIndex = 3;
-            this.btnAddRoleToUser.Text = "add";
-            this.btnAddRoleToUser.UseVisualStyleBackColor = true;
-            this.btnAddRoleToUser.Click += new System.EventHandler(this.btnAddRoleToUser_Click);
-            // 
-            // btnRemoveRoleFromUser
-            // 
-            this.btnRemoveRoleFromUser.Location = new System.Drawing.Point(191, 24);
-            this.btnRemoveRoleFromUser.Name = "btnRemoveRoleFromUser";
-            this.btnRemoveRoleFromUser.Size = new System.Drawing.Size(75, 23);
-            this.btnRemoveRoleFromUser.TabIndex = 2;
-            this.btnRemoveRoleFromUser.Text = "rem";
-            this.btnRemoveRoleFromUser.UseVisualStyleBackColor = true;
-            this.btnRemoveRoleFromUser.Click += new System.EventHandler(this.btnRemoveRoleFromUser_Click);
-            // 
-            // dgvUserRolesAll
-            // 
-            this.dgvUserRolesAll.AllowUserToAddRows = false;
-            this.dgvUserRolesAll.AllowUserToDeleteRows = false;
-            this.dgvUserRolesAll.AutoGenerateColumns = false;
-            this.dgvUserRolesAll.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dgvUserRolesAll.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+          this.dgvUsers.DataSource = this.userBindingSource2;
+          this.dgvUsers.Dock = System.Windows.Forms.DockStyle.Fill;
+          this.dgvUsers.Location = new System.Drawing.Point(3, 28);
+          this.dgvUsers.Name = "dgvUsers";
+          this.dgvUsers.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+          this.dgvUsers.Size = new System.Drawing.Size(1274, 213);
+          this.dgvUsers.TabIndex = 0;
+          this.dgvUsers.SelectionChanged += new System.EventHandler(this.dgvUsers_SelectionChanged);
+          // 
+          // idDataGridViewTextBoxColumn2
+          // 
+          this.idDataGridViewTextBoxColumn2.DataPropertyName = "Id";
+          this.idDataGridViewTextBoxColumn2.HeaderText = "Id";
+          this.idDataGridViewTextBoxColumn2.Name = "idDataGridViewTextBoxColumn2";
+          this.idDataGridViewTextBoxColumn2.Visible = false;
+          // 
+          // nameDataGridViewTextBoxColumn
+          // 
+          this.nameDataGridViewTextBoxColumn.DataPropertyName = "Name";
+          this.nameDataGridViewTextBoxColumn.HeaderText = "Name";
+          this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn";
+          // 
+          // emailDataGridViewTextBoxColumn
+          // 
+          this.emailDataGridViewTextBoxColumn.DataPropertyName = "Email";
+          this.emailDataGridViewTextBoxColumn.HeaderText = "Email";
+          this.emailDataGridViewTextBoxColumn.Name = "emailDataGridViewTextBoxColumn";
+          // 
+          // descriptionDataGridViewTextBoxColumn
+          // 
+          this.descriptionDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+          this.descriptionDataGridViewTextBoxColumn.DataPropertyName = "Description";
+          this.descriptionDataGridViewTextBoxColumn.HeaderText = "Description";
+          this.descriptionDataGridViewTextBoxColumn.Name = "descriptionDataGridViewTextBoxColumn";
+          // 
+          // userBindingSource2
+          // 
+          this.userBindingSource2.DataSource = typeof(HeuristicLab.Services.Authentication.DataTransfer.User);
+          // 
+          // toolStrip2
+          // 
+          this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsbNewUser,
+            this.tsbDeleteUser,
+            this.tsbSaveUser});
+          this.toolStrip2.Location = new System.Drawing.Point(3, 3);
+          this.toolStrip2.Name = "toolStrip2";
+          this.toolStrip2.Size = new System.Drawing.Size(1274, 25);
+          this.toolStrip2.TabIndex = 22;
+          this.toolStrip2.Text = "toolStrip2";
+          // 
+          // tsbNewUser
+          // 
+          this.tsbNewUser.Image = ((System.Drawing.Image)(resources.GetObject("tsbNewUser.Image")));
+          this.tsbNewUser.ImageTransparentColor = System.Drawing.Color.Magenta;
+          this.tsbNewUser.Name = "tsbNewUser";
+          this.tsbNewUser.Size = new System.Drawing.Size(47, 22);
+          this.tsbNewUser.Text = "new";
+          this.tsbNewUser.Click += new System.EventHandler(this.tsbNewUser_Click);
+          // 
+          // tsbDeleteUser
+          // 
+          this.tsbDeleteUser.Image = ((System.Drawing.Image)(resources.GetObject("tsbDeleteUser.Image")));
+          this.tsbDeleteUser.ImageTransparentColor = System.Drawing.Color.Magenta;
+          this.tsbDeleteUser.Name = "tsbDeleteUser";
+          this.tsbDeleteUser.Size = new System.Drawing.Size(57, 22);
+          this.tsbDeleteUser.Text = "delete";
+          this.tsbDeleteUser.Click += new System.EventHandler(this.tsbDeleteUser_Click);
+          // 
+          // tsbSaveUser
+          // 
+          this.tsbSaveUser.Image = ((System.Drawing.Image)(resources.GetObject("tsbSaveUser.Image")));
+          this.tsbSaveUser.ImageTransparentColor = System.Drawing.Color.Magenta;
+          this.tsbSaveUser.Name = "tsbSaveUser";
+          this.tsbSaveUser.Size = new System.Drawing.Size(50, 22);
+          this.tsbSaveUser.Text = "save";
+          this.tsbSaveUser.Click += new System.EventHandler(this.tsbSaveUser_Click);
+          // 
+          // panel3
+          // 
+          this.panel3.Controls.Add(this.gbResetPassword);
+          this.panel3.Controls.Add(this.tableLayoutPanel1);
+          this.panel3.Controls.Add(this.label3);
+          this.panel3.Controls.Add(nameLabel1);
+          this.panel3.Controls.Add(this.tbUserComment);
+          this.panel3.Controls.Add(this.tbUserName);
+          this.panel3.Controls.Add(emailLabel);
+          this.panel3.Controls.Add(this.tbUserEmail);
+          this.panel3.Controls.Add(commentLabel);
+          this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom;
+          this.panel3.Location = new System.Drawing.Point(3, 241);
+          this.panel3.Name = "panel3";
+          this.panel3.Size = new System.Drawing.Size(1274, 355);
+          this.panel3.TabIndex = 21;
+          // 
+          // tableLayoutPanel1
+          // 
+          this.tableLayoutPanel1.ColumnCount = 2;
+          this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+          this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+          this.tableLayoutPanel1.Controls.Add(this.panel4, 0, 0);
+          this.tableLayoutPanel1.Controls.Add(this.panel5, 1, 0);
+          this.tableLayoutPanel1.Location = new System.Drawing.Point(18, 94);
+          this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+          this.tableLayoutPanel1.RowCount = 1;
+          this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+          this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 219F));
+          this.tableLayoutPanel1.Size = new System.Drawing.Size(882, 219);
+          this.tableLayoutPanel1.TabIndex = 20;
+          // 
+          // panel4
+          // 
+          this.panel4.Controls.Add(this.dgvUserRoles);
+          this.panel4.Controls.Add(this.toolStrip3);
+          this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
+          this.panel4.Location = new System.Drawing.Point(3, 3);
+          this.panel4.Name = "panel4";
+          this.panel4.Size = new System.Drawing.Size(435, 213);
+          this.panel4.TabIndex = 19;
+          // 
+          // dgvUserRoles
+          // 
+          this.dgvUserRoles.AllowUserToAddRows = false;
+          this.dgvUserRoles.AllowUserToDeleteRows = false;
+          this.dgvUserRoles.AutoGenerateColumns = false;
+          this.dgvUserRoles.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+          this.dgvUserRoles.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.nameDataGridViewTextBoxColumn4});
-            this.dgvUserRolesAll.DataSource = this.bsRoles;
-            this.dgvUserRolesAll.Location = new System.Drawing.Point(544, 24);
-            this.dgvUserRolesAll.Name = "dgvUserRolesAll";
-            this.dgvUserRolesAll.Size = new System.Drawing.Size(175, 242);
-            this.dgvUserRolesAll.TabIndex = 1;
-            // 
-            // nameDataGridViewTextBoxColumn4
-            // 
-            this.nameDataGridViewTextBoxColumn4.DataPropertyName = "Name";
-            this.nameDataGridViewTextBoxColumn4.HeaderText = "Name";
-            this.nameDataGridViewTextBoxColumn4.Name = "nameDataGridViewTextBoxColumn4";
-            // 
-            // bsRoles
-            // 
-            this.bsRoles.DataSource = typeof(HeuristicLab.Services.Authentication.DataTransfer.Role);
-            // 
-            // dgvUserRoles
-            // 
-            this.dgvUserRoles.AllowUserToAddRows = false;
-            this.dgvUserRoles.AllowUserToDeleteRows = false;
-            this.dgvUserRoles.AutoGenerateColumns = false;
-            this.dgvUserRoles.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dgvUserRoles.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.nameDataGridViewTextBoxColumn3});
-            this.dgvUserRoles.DataSource = this.bsUserRoles;
-            this.dgvUserRoles.Location = new System.Drawing.Point(17, 24);
-            this.dgvUserRoles.Name = "dgvUserRoles";
-            this.dgvUserRoles.Size = new System.Drawing.Size(168, 242);
-            this.dgvUserRoles.TabIndex = 0;
-            // 
-            // nameDataGridViewTextBoxColumn3
-            // 
-            this.nameDataGridViewTextBoxColumn3.DataPropertyName = "Name";
-            this.nameDataGridViewTextBoxColumn3.HeaderText = "Name";
-            this.nameDataGridViewTextBoxColumn3.Name = "nameDataGridViewTextBoxColumn3";
-            // 
-            // bsUserRoles
-            // 
-            this.bsUserRoles.DataSource = typeof(HeuristicLab.Services.Authentication.DataTransfer.Role);
-            // 
-            // dgvUsers
-            // 
-            this.dgvUsers.AllowUserToAddRows = false;
-            this.dgvUsers.AllowUserToDeleteRows = false;
-            this.dgvUsers.AutoGenerateColumns = false;
-            this.dgvUsers.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dgvUsers.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.nameDataGridViewTextBoxColumn1,
-            this.emailDataGridViewTextBoxColumn,
-            this.commentDataGridViewTextBoxColumn,
-            this.lastLoginDateDataGridViewTextBoxColumn,
-            this.lastPasswordChangeDateDataGridViewTextBoxColumn,
-            this.lastLockoutDateDataGridViewTextBoxColumn,
-            this.lastActivityDateDataGridViewTextBoxColumn,
-            this.isLookedOutDataGridViewCheckBoxColumn,
-            this.isApprovedDataGridViewCheckBoxColumn});
-            this.dgvUsers.DataSource = this.bsUsers;
-            this.dgvUsers.Location = new System.Drawing.Point(6, 6);
-            this.dgvUsers.Name = "dgvUsers";
-            this.dgvUsers.Size = new System.Drawing.Size(809, 191);
-            this.dgvUsers.TabIndex = 0;
-            this.dgvUsers.SelectionChanged += new System.EventHandler(this.dgvUsers_SelectionChanged);
-            // 
-            // nameDataGridViewTextBoxColumn1
-            // 
-            this.nameDataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.nameDataGridViewTextBoxColumn1.DataPropertyName = "Name";
-            this.nameDataGridViewTextBoxColumn1.HeaderText = "Name";
-            this.nameDataGridViewTextBoxColumn1.Name = "nameDataGridViewTextBoxColumn1";
-            this.nameDataGridViewTextBoxColumn1.Width = 60;
-            // 
-            // emailDataGridViewTextBoxColumn
-            // 
-            this.emailDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.emailDataGridViewTextBoxColumn.DataPropertyName = "Email";
-            this.emailDataGridViewTextBoxColumn.HeaderText = "Email";
-            this.emailDataGridViewTextBoxColumn.Name = "emailDataGridViewTextBoxColumn";
-            this.emailDataGridViewTextBoxColumn.Width = 57;
-            // 
-            // commentDataGridViewTextBoxColumn
-            // 
-            this.commentDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.commentDataGridViewTextBoxColumn.DataPropertyName = "Comment";
-            this.commentDataGridViewTextBoxColumn.HeaderText = "Comment";
-            this.commentDataGridViewTextBoxColumn.Name = "commentDataGridViewTextBoxColumn";
-            this.commentDataGridViewTextBoxColumn.Width = 76;
-            // 
-            // lastLoginDateDataGridViewTextBoxColumn
-            // 
-            this.lastLoginDateDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.lastLoginDateDataGridViewTextBoxColumn.DataPropertyName = "LastLoginDate";
-            this.lastLoginDateDataGridViewTextBoxColumn.HeaderText = "LastLoginDate";
-            this.lastLoginDateDataGridViewTextBoxColumn.Name = "lastLoginDateDataGridViewTextBoxColumn";
-            this.lastLoginDateDataGridViewTextBoxColumn.Width = 101;
-            // 
-            // lastPasswordChangeDateDataGridViewTextBoxColumn
-            // 
-            this.lastPasswordChangeDateDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.lastPasswordChangeDateDataGridViewTextBoxColumn.DataPropertyName = "LastPasswordChangeDate";
-            this.lastPasswordChangeDateDataGridViewTextBoxColumn.HeaderText = "LastPasswordChangeDate";
-            this.lastPasswordChangeDateDataGridViewTextBoxColumn.Name = "lastPasswordChangeDateDataGridViewTextBoxColumn";
-            this.lastPasswordChangeDateDataGridViewTextBoxColumn.Width = 158;
-            // 
-            // lastLockoutDateDataGridViewTextBoxColumn
-            // 
-            this.lastLockoutDateDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.lastLockoutDateDataGridViewTextBoxColumn.DataPropertyName = "LastLockoutDate";
-            this.lastLockoutDateDataGridViewTextBoxColumn.HeaderText = "LastLockoutDate";
-            this.lastLockoutDateDataGridViewTextBoxColumn.Name = "lastLockoutDateDataGridViewTextBoxColumn";
-            this.lastLockoutDateDataGridViewTextBoxColumn.Width = 114;
-            // 
-            // lastActivityDateDataGridViewTextBoxColumn
-            // 
-            this.lastActivityDateDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.lastActivityDateDataGridViewTextBoxColumn.DataPropertyName = "LastActivityDate";
-            this.lastActivityDateDataGridViewTextBoxColumn.HeaderText = "LastActivityDate";
-            this.lastActivityDateDataGridViewTextBoxColumn.Name = "lastActivityDateDataGridViewTextBoxColumn";
-            this.lastActivityDateDataGridViewTextBoxColumn.Width = 109;
-            // 
-            // isLookedOutDataGridViewCheckBoxColumn
-            // 
-            this.isLookedOutDataGridViewCheckBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.isLookedOutDataGridViewCheckBoxColumn.DataPropertyName = "IsLookedOut";
-            this.isLookedOutDataGridViewCheckBoxColumn.HeaderText = "IsLookedOut";
-            this.isLookedOutDataGridViewCheckBoxColumn.Name = "isLookedOutDataGridViewCheckBoxColumn";
-            this.isLookedOutDataGridViewCheckBoxColumn.Width = 74;
-            // 
-            // isApprovedDataGridViewCheckBoxColumn
-            // 
-            this.isApprovedDataGridViewCheckBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.isApprovedDataGridViewCheckBoxColumn.DataPropertyName = "IsApproved";
-            this.isApprovedDataGridViewCheckBoxColumn.HeaderText = "IsApproved";
-            this.isApprovedDataGridViewCheckBoxColumn.Name = "isApprovedDataGridViewCheckBoxColumn";
-            this.isApprovedDataGridViewCheckBoxColumn.Width = 67;
-            // 
-            // tpRoles
-            // 
-            this.tpRoles.AutoScroll = true;
-            this.tpRoles.Controls.Add(this.tcRole);
-            this.tpRoles.Controls.Add(this.dgvRoles);
-            this.tpRoles.Location = new System.Drawing.Point(4, 22);
-            this.tpRoles.Name = "tpRoles";
-            this.tpRoles.Size = new System.Drawing.Size(821, 530);
-            this.tpRoles.TabIndex = 2;
-            this.tpRoles.Text = "Roles";
-            this.tpRoles.UseVisualStyleBackColor = true;
-            // 
-            // tcRole
-            // 
-            this.tcRole.Controls.Add(this.tabPage3);
-            this.tcRole.Controls.Add(this.tabPage4);
-            this.tcRole.Location = new System.Drawing.Point(3, 202);
-            this.tcRole.Name = "tcRole";
-            this.tcRole.SelectedIndex = 0;
-            this.tcRole.Size = new System.Drawing.Size(815, 253);
-            this.tcRole.TabIndex = 10;
-            // 
-            // tabPage3
-            // 
-            this.tabPage3.Controls.Add(this.btnNewRole);
-            this.tabPage3.Controls.Add(descriptionLabel1);
-            this.tabPage3.Controls.Add(this.btnUpdateRole);
-            this.tabPage3.Controls.Add(this.descriptionTextBox1);
-            this.tabPage3.Controls.Add(this.btnDeleteRole);
-            this.tabPage3.Controls.Add(loweredRoleNameLabel);
-            this.tabPage3.Controls.Add(this.loweredRoleNameTextBox);
-            this.tabPage3.Controls.Add(this.nameTextBox2);
-            this.tabPage3.Controls.Add(nameLabel2);
-            this.tabPage3.Location = new System.Drawing.Point(4, 22);
-            this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage3.Size = new System.Drawing.Size(807, 227);
-            this.tabPage3.TabIndex = 0;
-            this.tabPage3.Text = "tabPage3";
-            this.tabPage3.UseVisualStyleBackColor = true;
-            // 
-            // btnNewRole
-            // 
-            this.btnNewRole.Location = new System.Drawing.Point(205, 42);
-            this.btnNewRole.Name = "btnNewRole";
-            this.btnNewRole.Size = new System.Drawing.Size(75, 23);
-            this.btnNewRole.TabIndex = 7;
-            this.btnNewRole.Text = "new";
-            this.btnNewRole.UseVisualStyleBackColor = true;
-            this.btnNewRole.Click += new System.EventHandler(this.btnNewRole_Click);
-            // 
-            // btnUpdateRole
-            // 
-            this.btnUpdateRole.Location = new System.Drawing.Point(205, 102);
-            this.btnUpdateRole.Name = "btnUpdateRole";
-            this.btnUpdateRole.Size = new System.Drawing.Size(75, 23);
-            this.btnUpdateRole.TabIndex = 9;
-            this.btnUpdateRole.Text = "upd";
-            this.btnUpdateRole.UseVisualStyleBackColor = true;
-            this.btnUpdateRole.Click += new System.EventHandler(this.btnUpdateRole_Click);
-            // 
-            // descriptionTextBox1
-            // 
-            this.descriptionTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsRoles, "Description", true));
-            this.descriptionTextBox1.Location = new System.Drawing.Point(44, 144);
-            this.descriptionTextBox1.Name = "descriptionTextBox1";
-            this.descriptionTextBox1.Size = new System.Drawing.Size(100, 20);
-            this.descriptionTextBox1.TabIndex = 6;
-            // 
-            // btnDeleteRole
-            // 
-            this.btnDeleteRole.Location = new System.Drawing.Point(205, 72);
-            this.btnDeleteRole.Name = "btnDeleteRole";
-            this.btnDeleteRole.Size = new System.Drawing.Size(75, 23);
-            this.btnDeleteRole.TabIndex = 8;
-            this.btnDeleteRole.Text = "del";
-            this.btnDeleteRole.UseVisualStyleBackColor = true;
-            this.btnDeleteRole.Click += new System.EventHandler(this.btnDeleteRole_Click);
-            // 
-            // loweredRoleNameTextBox
-            // 
-            this.loweredRoleNameTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsRoles, "LoweredRoleName", true));
-            this.loweredRoleNameTextBox.Location = new System.Drawing.Point(44, 94);
-            this.loweredRoleNameTextBox.Name = "loweredRoleNameTextBox";
-            this.loweredRoleNameTextBox.Size = new System.Drawing.Size(100, 20);
-            this.loweredRoleNameTextBox.TabIndex = 4;
-            // 
-            // nameTextBox2
-            // 
-            this.nameTextBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsRoles, "Name", true));
-            this.nameTextBox2.Location = new System.Drawing.Point(44, 42);
-            this.nameTextBox2.Name = "nameTextBox2";
-            this.nameTextBox2.Size = new System.Drawing.Size(100, 20);
-            this.nameTextBox2.TabIndex = 2;
-            // 
-            // tabPage4
-            // 
-            this.tabPage4.Controls.Add(this.btnAddUserToRole);
-            this.tabPage4.Controls.Add(this.btnRemoveUserFromRole);
-            this.tabPage4.Controls.Add(this.dgvRoleUsersAll);
-            this.tabPage4.Controls.Add(this.dgvRoleUsers);
-            this.tabPage4.Location = new System.Drawing.Point(4, 22);
-            this.tabPage4.Name = "tabPage4";
-            this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage4.Size = new System.Drawing.Size(807, 227);
-            this.tabPage4.TabIndex = 1;
-            this.tabPage4.Text = "tabPage4";
-            this.tabPage4.UseVisualStyleBackColor = true;
-            // 
-            // btnAddUserToRole
-            // 
-            this.btnAddUserToRole.Location = new System.Drawing.Point(463, 37);
-            this.btnAddUserToRole.Name = "btnAddUserToRole";
-            this.btnAddUserToRole.Size = new System.Drawing.Size(75, 23);
-            this.btnAddUserToRole.TabIndex = 3;
-            this.btnAddUserToRole.Text = "add";
-            this.btnAddUserToRole.UseVisualStyleBackColor = true;
-            this.btnAddUserToRole.Click += new System.EventHandler(this.btnAddUserToRole_Click);
-            // 
-            // btnRemoveUserFromRole
-            // 
-            this.btnRemoveUserFromRole.Location = new System.Drawing.Point(205, 37);
-            this.btnRemoveUserFromRole.Name = "btnRemoveUserFromRole";
-            this.btnRemoveUserFromRole.Size = new System.Drawing.Size(75, 23);
-            this.btnRemoveUserFromRole.TabIndex = 2;
-            this.btnRemoveUserFromRole.Text = "rem";
-            this.btnRemoveUserFromRole.UseVisualStyleBackColor = true;
-            this.btnRemoveUserFromRole.Click += new System.EventHandler(this.btnRemoveUserFromRole_Click);
-            // 
-            // dgvRoleUsersAll
-            // 
-            this.dgvRoleUsersAll.AllowUserToAddRows = false;
-            this.dgvRoleUsersAll.AllowUserToDeleteRows = false;
-            this.dgvRoleUsersAll.AutoGenerateColumns = false;
-            this.dgvRoleUsersAll.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dgvRoleUsersAll.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.nameDataGridViewTextBoxColumn6});
-            this.dgvRoleUsersAll.DataSource = this.bsUsers;
-            this.dgvRoleUsersAll.Location = new System.Drawing.Point(544, 37);
-            this.dgvRoleUsersAll.Name = "dgvRoleUsersAll";
-            this.dgvRoleUsersAll.Size = new System.Drawing.Size(240, 150);
-            this.dgvRoleUsersAll.TabIndex = 1;
-            // 
-            // nameDataGridViewTextBoxColumn6
-            // 
-            this.nameDataGridViewTextBoxColumn6.DataPropertyName = "Name";
-            this.nameDataGridViewTextBoxColumn6.HeaderText = "Name";
-            this.nameDataGridViewTextBoxColumn6.Name = "nameDataGridViewTextBoxColumn6";
-            // 
-            // dgvRoleUsers
-            // 
-            this.dgvRoleUsers.AllowUserToAddRows = false;
-            this.dgvRoleUsers.AllowUserToDeleteRows = false;
-            this.dgvRoleUsers.AutoGenerateColumns = false;
-            this.dgvRoleUsers.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dgvRoleUsers.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+          this.dgvUserRoles.DataSource = this.roleBindingSource1;
+          this.dgvUserRoles.Dock = System.Windows.Forms.DockStyle.Fill;
+          this.dgvUserRoles.Location = new System.Drawing.Point(0, 25);
+          this.dgvUserRoles.Name = "dgvUserRoles";
+          this.dgvUserRoles.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+          this.dgvUserRoles.ShowCellErrors = false;
+          this.dgvUserRoles.ShowCellToolTips = false;
+          this.dgvUserRoles.ShowEditingIcon = false;
+          this.dgvUserRoles.ShowRowErrors = false;
+          this.dgvUserRoles.Size = new System.Drawing.Size(435, 188);
+          this.dgvUserRoles.TabIndex = 0;
+          // 
+          // nameDataGridViewTextBoxColumn4
+          // 
+          this.nameDataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+          this.nameDataGridViewTextBoxColumn4.DataPropertyName = "Name";
+          this.nameDataGridViewTextBoxColumn4.HeaderText = "Name";
+          this.nameDataGridViewTextBoxColumn4.Name = "nameDataGridViewTextBoxColumn4";
+          // 
+          // roleBindingSource1
+          // 
+          this.roleBindingSource1.DataSource = typeof(HeuristicLab.Services.Authentication.DataTransfer.Role);
+          // 
+          // toolStrip3
+          // 
+          this.toolStrip3.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsbRemoveRoleFromUser});
+          this.toolStrip3.Location = new System.Drawing.Point(0, 0);
+          this.toolStrip3.Name = "toolStrip3";
+          this.toolStrip3.Size = new System.Drawing.Size(435, 25);
+          this.toolStrip3.TabIndex = 19;
+          this.toolStrip3.Text = "toolStrip3";
+          // 
+          // tsbRemoveRoleFromUser
+          // 
+          this.tsbRemoveRoleFromUser.Image = ((System.Drawing.Image)(resources.GetObject("tsbRemoveRoleFromUser.Image")));
+          this.tsbRemoveRoleFromUser.ImageTransparentColor = System.Drawing.Color.Magenta;
+          this.tsbRemoveRoleFromUser.Name = "tsbRemoveRoleFromUser";
+          this.tsbRemoveRoleFromUser.Size = new System.Drawing.Size(63, 22);
+          this.tsbRemoveRoleFromUser.Text = "remove";
+          this.tsbRemoveRoleFromUser.Click += new System.EventHandler(this.tsbRemoveRoleFromUser_Click);
+          // 
+          // panel5
+          // 
+          this.panel5.Controls.Add(this.dgvUserRolesAll);
+          this.panel5.Controls.Add(this.toolStrip4);
+          this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
+          this.panel5.Location = new System.Drawing.Point(444, 3);
+          this.panel5.Name = "panel5";
+          this.panel5.Size = new System.Drawing.Size(435, 213);
+          this.panel5.TabIndex = 20;
+          // 
+          // dgvUserRolesAll
+          // 
+          this.dgvUserRolesAll.AllowUserToAddRows = false;
+          this.dgvUserRolesAll.AllowUserToDeleteRows = false;
+          this.dgvUserRolesAll.AutoGenerateColumns = false;
+          this.dgvUserRolesAll.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+          this.dgvUserRolesAll.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.nameDataGridViewTextBoxColumn5});
-            this.dgvRoleUsers.DataSource = this.bsRoleUsers;
-            this.dgvRoleUsers.Location = new System.Drawing.Point(15, 37);
-            this.dgvRoleUsers.Name = "dgvRoleUsers";
-            this.dgvRoleUsers.Size = new System.Drawing.Size(184, 150);
-            this.dgvRoleUsers.TabIndex = 0;
-            // 
-            // nameDataGridViewTextBoxColumn5
-            // 
-            this.nameDataGridViewTextBoxColumn5.DataPropertyName = "Name";
-            this.nameDataGridViewTextBoxColumn5.HeaderText = "Name";
-            this.nameDataGridViewTextBoxColumn5.Name = "nameDataGridViewTextBoxColumn5";
-            // 
-            // bsRoleUsers
-            // 
-            this.bsRoleUsers.DataSource = typeof(HeuristicLab.Services.Authentication.DataTransfer.User);
-            // 
-            // dgvRoles
-            // 
-            this.dgvRoles.AllowUserToAddRows = false;
-            this.dgvRoles.AllowUserToDeleteRows = false;
-            this.dgvRoles.AutoGenerateColumns = false;
-            this.dgvRoles.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dgvRoles.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.nameDataGridViewTextBoxColumn2,
-            this.loweredRoleNameDataGridViewTextBoxColumn,
+          this.dgvUserRolesAll.DataSource = this.roleBindingSource2;
+          this.dgvUserRolesAll.Dock = System.Windows.Forms.DockStyle.Fill;
+          this.dgvUserRolesAll.Location = new System.Drawing.Point(0, 25);
+          this.dgvUserRolesAll.Name = "dgvUserRolesAll";
+          this.dgvUserRolesAll.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+          this.dgvUserRolesAll.Size = new System.Drawing.Size(435, 188);
+          this.dgvUserRolesAll.TabIndex = 1;
+          // 
+          // nameDataGridViewTextBoxColumn5
+          // 
+          this.nameDataGridViewTextBoxColumn5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+          this.nameDataGridViewTextBoxColumn5.DataPropertyName = "Name";
+          this.nameDataGridViewTextBoxColumn5.HeaderText = "Name";
+          this.nameDataGridViewTextBoxColumn5.Name = "nameDataGridViewTextBoxColumn5";
+          // 
+          // roleBindingSource2
+          // 
+          this.roleBindingSource2.DataSource = typeof(HeuristicLab.Services.Authentication.DataTransfer.Role);
+          // 
+          // toolStrip4
+          // 
+          this.toolStrip4.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsbAddRoleToUser});
+          this.toolStrip4.Location = new System.Drawing.Point(0, 0);
+          this.toolStrip4.Name = "toolStrip4";
+          this.toolStrip4.Size = new System.Drawing.Size(435, 25);
+          this.toolStrip4.TabIndex = 4;
+          this.toolStrip4.Text = "toolStrip4";
+          // 
+          // tsbAddRoleToUser
+          // 
+          this.tsbAddRoleToUser.Image = ((System.Drawing.Image)(resources.GetObject("tsbAddRoleToUser.Image")));
+          this.tsbAddRoleToUser.ImageTransparentColor = System.Drawing.Color.Magenta;
+          this.tsbAddRoleToUser.Name = "tsbAddRoleToUser";
+          this.tsbAddRoleToUser.Size = new System.Drawing.Size(45, 22);
+          this.tsbAddRoleToUser.Text = "add";
+          this.tsbAddRoleToUser.Click += new System.EventHandler(this.tsbAddRoleToUser_Click);
+          // 
+          // label3
+          // 
+          this.label3.AutoSize = true;
+          this.label3.Location = new System.Drawing.Point(568, 168);
+          this.label3.Name = "label3";
+          this.label3.Size = new System.Drawing.Size(79, 13);
+          this.label3.TabIndex = 19;
+          this.label3.Text = "available Roles";
+          // 
+          // tbUserComment
+          // 
+          this.tbUserComment.Location = new System.Drawing.Point(18, 34);
+          this.tbUserComment.Name = "tbUserComment";
+          this.tbUserComment.Size = new System.Drawing.Size(100, 20);
+          this.tbUserComment.TabIndex = 2;
+          this.tbUserComment.TextChanged += new System.EventHandler(this.tbUserComment_TextChanged);
+          // 
+          // tbUserName
+          // 
+          this.tbUserName.Location = new System.Drawing.Point(163, 34);
+          this.tbUserName.Name = "tbUserName";
+          this.tbUserName.Size = new System.Drawing.Size(100, 20);
+          this.tbUserName.TabIndex = 10;
+          this.tbUserName.TextChanged += new System.EventHandler(this.tbUserName_TextChanged);
+          // 
+          // tbUserEmail
+          // 
+          this.tbUserEmail.Location = new System.Drawing.Point(323, 34);
+          this.tbUserEmail.Name = "tbUserEmail";
+          this.tbUserEmail.Size = new System.Drawing.Size(100, 20);
+          this.tbUserEmail.TabIndex = 4;
+          this.tbUserEmail.TextChanged += new System.EventHandler(this.tbUserEmail_TextChanged);
+          // 
+          // statusStrip2
+          // 
+          this.statusStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tssStatusUser});
+          this.statusStrip2.Location = new System.Drawing.Point(3, 596);
+          this.statusStrip2.Name = "statusStrip2";
+          this.statusStrip2.Size = new System.Drawing.Size(1274, 22);
+          this.statusStrip2.TabIndex = 23;
+          this.statusStrip2.Text = "statusStrip2";
+          // 
+          // tssStatusUser
+          // 
+          this.tssStatusUser.Name = "tssStatusUser";
+          this.tssStatusUser.Size = new System.Drawing.Size(0, 17);
+          // 
+          // tpRoles
+          // 
+          this.tpRoles.AutoScroll = true;
+          this.tpRoles.Controls.Add(this.dgvRoles);
+          this.tpRoles.Controls.Add(this.panel6);
+          this.tpRoles.Controls.Add(this.statusStrip3);
+          this.tpRoles.Controls.Add(this.toolStrip5);
+          this.tpRoles.Location = new System.Drawing.Point(4, 22);
+          this.tpRoles.Name = "tpRoles";
+          this.tpRoles.Size = new System.Drawing.Size(1280, 621);
+          this.tpRoles.TabIndex = 2;
+          this.tpRoles.Text = "Roles";
+          this.tpRoles.UseVisualStyleBackColor = true;
+          // 
+          // dgvRoles
+          // 
+          this.dgvRoles.AllowUserToAddRows = false;
+          this.dgvRoles.AllowUserToDeleteRows = false;
+          this.dgvRoles.AutoGenerateColumns = false;
+          this.dgvRoles.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+          this.dgvRoles.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.idDataGridViewTextBoxColumn1,
+            this.nameDataGridViewTextBoxColumn3,
             this.descriptionDataGridViewTextBoxColumn1});
-            this.dgvRoles.DataSource = this.bsRoles;
-            this.dgvRoles.Location = new System.Drawing.Point(3, 3);
-            this.dgvRoles.Name = "dgvRoles";
-            this.dgvRoles.Size = new System.Drawing.Size(815, 193);
-            this.dgvRoles.TabIndex = 0;
-            this.dgvRoles.SelectionChanged += new System.EventHandler(this.dgvRoles_SelectionChanged);
-            // 
-            // nameDataGridViewTextBoxColumn2
-            // 
-            this.nameDataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.nameDataGridViewTextBoxColumn2.DataPropertyName = "Name";
-            this.nameDataGridViewTextBoxColumn2.HeaderText = "Name";
-            this.nameDataGridViewTextBoxColumn2.Name = "nameDataGridViewTextBoxColumn2";
-            this.nameDataGridViewTextBoxColumn2.Width = 60;
-            // 
-            // loweredRoleNameDataGridViewTextBoxColumn
-            // 
-            this.loweredRoleNameDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.loweredRoleNameDataGridViewTextBoxColumn.DataPropertyName = "LoweredRoleName";
-            this.loweredRoleNameDataGridViewTextBoxColumn.HeaderText = "LoweredRoleName";
-            this.loweredRoleNameDataGridViewTextBoxColumn.Name = "loweredRoleNameDataGridViewTextBoxColumn";
-            this.loweredRoleNameDataGridViewTextBoxColumn.Width = 123;
-            // 
-            // descriptionDataGridViewTextBoxColumn1
-            // 
-            this.descriptionDataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.descriptionDataGridViewTextBoxColumn1.DataPropertyName = "Description";
-            this.descriptionDataGridViewTextBoxColumn1.HeaderText = "Description";
-            this.descriptionDataGridViewTextBoxColumn1.Name = "descriptionDataGridViewTextBoxColumn1";
-            this.descriptionDataGridViewTextBoxColumn1.Width = 85;
-            // 
-            // cbxApplications
-            // 
-            this.cbxApplications.DataSource = this.bsApplicationsCombo;
-            this.cbxApplications.DisplayMember = "Name";
-            this.cbxApplications.FormattingEnabled = true;
-            this.cbxApplications.Location = new System.Drawing.Point(31, 24);
-            this.cbxApplications.Name = "cbxApplications";
-            this.cbxApplications.Size = new System.Drawing.Size(234, 21);
-            this.cbxApplications.TabIndex = 1;
-            this.cbxApplications.SelectedIndexChanged += new System.EventHandler(this.cbxApplications_SelectedIndexChanged);
-            // 
-            // bsApplicationsCombo
-            // 
-            this.bsApplicationsCombo.DataSource = typeof(HeuristicLab.Services.Authentication.DataTransfer.Application);
-            // 
-            // UserManagement
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(904, 631);
-            this.Controls.Add(this.cbxApplications);
-            this.Controls.Add(this.tcMain);
-            this.Name = "UserManagement";
-            this.Text = "UserManagement";
-            this.tcMain.ResumeLayout(false);
-            this.tpApplications.ResumeLayout(false);
-            this.tpApplications.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.bsApplications)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvApplications)).EndInit();
-            this.tpUsers.ResumeLayout(false);
-            this.tcUser.ResumeLayout(false);
-            this.tabPage1.ResumeLayout(false);
-            this.tabPage1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.bsUsers)).EndInit();
-            this.tabPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dgvUserRolesAll)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsRoles)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvUserRoles)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsUserRoles)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvUsers)).EndInit();
-            this.tpRoles.ResumeLayout(false);
-            this.tcRole.ResumeLayout(false);
-            this.tabPage3.ResumeLayout(false);
-            this.tabPage3.PerformLayout();
-            this.tabPage4.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dgvRoleUsersAll)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvRoleUsers)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsRoleUsers)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvRoles)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsApplicationsCombo)).EndInit();
-            this.ResumeLayout(false);
+          this.dgvRoles.DataSource = this.roleBindingSource;
+          this.dgvRoles.Dock = System.Windows.Forms.DockStyle.Fill;
+          this.dgvRoles.Location = new System.Drawing.Point(0, 25);
+          this.dgvRoles.Name = "dgvRoles";
+          this.dgvRoles.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+          this.dgvRoles.Size = new System.Drawing.Size(1280, 266);
+          this.dgvRoles.TabIndex = 0;
+          this.dgvRoles.SelectionChanged += new System.EventHandler(this.dgvRoles_SelectionChanged);
+          // 
+          // idDataGridViewTextBoxColumn1
+          // 
+          this.idDataGridViewTextBoxColumn1.DataPropertyName = "Id";
+          this.idDataGridViewTextBoxColumn1.HeaderText = "Id";
+          this.idDataGridViewTextBoxColumn1.Name = "idDataGridViewTextBoxColumn1";
+          this.idDataGridViewTextBoxColumn1.Visible = false;
+          // 
+          // nameDataGridViewTextBoxColumn3
+          // 
+          this.nameDataGridViewTextBoxColumn3.DataPropertyName = "Name";
+          this.nameDataGridViewTextBoxColumn3.HeaderText = "Name";
+          this.nameDataGridViewTextBoxColumn3.Name = "nameDataGridViewTextBoxColumn3";
+          // 
+          // descriptionDataGridViewTextBoxColumn1
+          // 
+          this.descriptionDataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+          this.descriptionDataGridViewTextBoxColumn1.DataPropertyName = "Description";
+          this.descriptionDataGridViewTextBoxColumn1.HeaderText = "Description";
+          this.descriptionDataGridViewTextBoxColumn1.Name = "descriptionDataGridViewTextBoxColumn1";
+          // 
+          // roleBindingSource
+          // 
+          this.roleBindingSource.DataSource = typeof(HeuristicLab.Services.Authentication.DataTransfer.Role);
+          // 
+          // panel6
+          // 
+          this.panel6.Controls.Add(this.tableLayoutPanel2);
+          this.panel6.Controls.Add(this.tbRoleName);
+          this.panel6.Controls.Add(this.tbRoleDescription);
+          this.panel6.Controls.Add(nameLabel2);
+          this.panel6.Controls.Add(descriptionLabel1);
+          this.panel6.Dock = System.Windows.Forms.DockStyle.Bottom;
+          this.panel6.Location = new System.Drawing.Point(0, 291);
+          this.panel6.Name = "panel6";
+          this.panel6.Size = new System.Drawing.Size(1280, 308);
+          this.panel6.TabIndex = 24;
+          // 
+          // tableLayoutPanel2
+          // 
+          this.tableLayoutPanel2.ColumnCount = 2;
+          this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+          this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+          this.tableLayoutPanel2.Controls.Add(this.panel8, 1, 0);
+          this.tableLayoutPanel2.Controls.Add(this.panel7, 0, 0);
+          this.tableLayoutPanel2.Location = new System.Drawing.Point(27, 64);
+          this.tableLayoutPanel2.Name = "tableLayoutPanel2";
+          this.tableLayoutPanel2.RowCount = 1;
+          this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+          this.tableLayoutPanel2.Size = new System.Drawing.Size(768, 194);
+          this.tableLayoutPanel2.TabIndex = 7;
+          // 
+          // panel8
+          // 
+          this.panel8.Controls.Add(this.dgvRoleUsersAll);
+          this.panel8.Controls.Add(this.toolStrip7);
+          this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
+          this.panel8.Location = new System.Drawing.Point(387, 3);
+          this.panel8.Name = "panel8";
+          this.panel8.Size = new System.Drawing.Size(378, 188);
+          this.panel8.TabIndex = 26;
+          // 
+          // dgvRoleUsersAll
+          // 
+          this.dgvRoleUsersAll.AllowUserToAddRows = false;
+          this.dgvRoleUsersAll.AllowUserToDeleteRows = false;
+          this.dgvRoleUsersAll.AutoGenerateColumns = false;
+          this.dgvRoleUsersAll.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+          this.dgvRoleUsersAll.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.nameDataGridViewTextBoxColumn1});
+          this.dgvRoleUsersAll.DataSource = this.userBindingSource;
+          this.dgvRoleUsersAll.Dock = System.Windows.Forms.DockStyle.Fill;
+          this.dgvRoleUsersAll.Location = new System.Drawing.Point(0, 25);
+          this.dgvRoleUsersAll.Name = "dgvRoleUsersAll";
+          this.dgvRoleUsersAll.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+          this.dgvRoleUsersAll.Size = new System.Drawing.Size(378, 163);
+          this.dgvRoleUsersAll.TabIndex = 1;
+          // 
+          // nameDataGridViewTextBoxColumn1
+          // 
+          this.nameDataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+          this.nameDataGridViewTextBoxColumn1.DataPropertyName = "Name";
+          this.nameDataGridViewTextBoxColumn1.HeaderText = "Name";
+          this.nameDataGridViewTextBoxColumn1.Name = "nameDataGridViewTextBoxColumn1";
+          // 
+          // userBindingSource
+          // 
+          this.userBindingSource.DataSource = typeof(HeuristicLab.Services.Authentication.DataTransfer.User);
+          // 
+          // toolStrip7
+          // 
+          this.toolStrip7.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsbAddUserToRole});
+          this.toolStrip7.Location = new System.Drawing.Point(0, 0);
+          this.toolStrip7.Name = "toolStrip7";
+          this.toolStrip7.Size = new System.Drawing.Size(378, 25);
+          this.toolStrip7.TabIndex = 4;
+          this.toolStrip7.Text = "toolStrip7";
+          // 
+          // tsbAddUserToRole
+          // 
+          this.tsbAddUserToRole.Image = ((System.Drawing.Image)(resources.GetObject("tsbAddUserToRole.Image")));
+          this.tsbAddUserToRole.ImageTransparentColor = System.Drawing.Color.Magenta;
+          this.tsbAddUserToRole.Name = "tsbAddUserToRole";
+          this.tsbAddUserToRole.Size = new System.Drawing.Size(45, 22);
+          this.tsbAddUserToRole.Text = "add";
+          this.tsbAddUserToRole.Click += new System.EventHandler(this.tsbAddUserToRole_Click);
+          // 
+          // panel7
+          // 
+          this.panel7.Controls.Add(this.dgvRoleUsers);
+          this.panel7.Controls.Add(this.toolStrip6);
+          this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
+          this.panel7.Location = new System.Drawing.Point(3, 3);
+          this.panel7.Name = "panel7";
+          this.panel7.Size = new System.Drawing.Size(378, 188);
+          this.panel7.TabIndex = 25;
+          // 
+          // dgvRoleUsers
+          // 
+          this.dgvRoleUsers.AllowUserToAddRows = false;
+          this.dgvRoleUsers.AllowUserToDeleteRows = false;
+          this.dgvRoleUsers.AutoGenerateColumns = false;
+          this.dgvRoleUsers.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+          this.dgvRoleUsers.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.nameDataGridViewTextBoxColumn2});
+          this.dgvRoleUsers.DataSource = this.userBindingSource1;
+          this.dgvRoleUsers.Dock = System.Windows.Forms.DockStyle.Fill;
+          this.dgvRoleUsers.Location = new System.Drawing.Point(0, 25);
+          this.dgvRoleUsers.Name = "dgvRoleUsers";
+          this.dgvRoleUsers.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+          this.dgvRoleUsers.Size = new System.Drawing.Size(378, 163);
+          this.dgvRoleUsers.TabIndex = 0;
+          // 
+          // nameDataGridViewTextBoxColumn2
+          // 
+          this.nameDataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+          this.nameDataGridViewTextBoxColumn2.DataPropertyName = "Name";
+          this.nameDataGridViewTextBoxColumn2.HeaderText = "Name";
+          this.nameDataGridViewTextBoxColumn2.Name = "nameDataGridViewTextBoxColumn2";
+          // 
+          // userBindingSource1
+          // 
+          this.userBindingSource1.DataSource = typeof(HeuristicLab.Services.Authentication.DataTransfer.User);
+          // 
+          // toolStrip6
+          // 
+          this.toolStrip6.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsbRemoveUserFromRole});
+          this.toolStrip6.Location = new System.Drawing.Point(0, 0);
+          this.toolStrip6.Name = "toolStrip6";
+          this.toolStrip6.Size = new System.Drawing.Size(378, 25);
+          this.toolStrip6.TabIndex = 3;
+          this.toolStrip6.Text = "toolStrip6";
+          // 
+          // tsbRemoveUserFromRole
+          // 
+          this.tsbRemoveUserFromRole.Image = ((System.Drawing.Image)(resources.GetObject("tsbRemoveUserFromRole.Image")));
+          this.tsbRemoveUserFromRole.ImageTransparentColor = System.Drawing.Color.Magenta;
+          this.tsbRemoveUserFromRole.Name = "tsbRemoveUserFromRole";
+          this.tsbRemoveUserFromRole.Size = new System.Drawing.Size(63, 22);
+          this.tsbRemoveUserFromRole.Text = "remove";
+          this.tsbRemoveUserFromRole.Click += new System.EventHandler(this.tsbRemoveUserFromRole_Click);
+          // 
+          // tbRoleName
+          // 
+          this.tbRoleName.Location = new System.Drawing.Point(27, 29);
+          this.tbRoleName.Name = "tbRoleName";
+          this.tbRoleName.Size = new System.Drawing.Size(164, 20);
+          this.tbRoleName.TabIndex = 2;
+          this.tbRoleName.TextChanged += new System.EventHandler(this.tbRoleName_TextChanged);
+          // 
+          // tbRoleDescription
+          // 
+          this.tbRoleDescription.Location = new System.Drawing.Point(217, 29);
+          this.tbRoleDescription.Name = "tbRoleDescription";
+          this.tbRoleDescription.Size = new System.Drawing.Size(200, 20);
+          this.tbRoleDescription.TabIndex = 6;
+          this.tbRoleDescription.TextChanged += new System.EventHandler(this.tbRoleDescription_TextChanged);
+          // 
+          // statusStrip3
+          // 
+          this.statusStrip3.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tssStatusRole});
+          this.statusStrip3.Location = new System.Drawing.Point(0, 599);
+          this.statusStrip3.Name = "statusStrip3";
+          this.statusStrip3.Size = new System.Drawing.Size(1280, 22);
+          this.statusStrip3.TabIndex = 23;
+          this.statusStrip3.Text = "statusStrip3";
+          // 
+          // tssStatusRole
+          // 
+          this.tssStatusRole.Name = "tssStatusRole";
+          this.tssStatusRole.Size = new System.Drawing.Size(0, 17);
+          // 
+          // toolStrip5
+          // 
+          this.toolStrip5.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tspNewRole,
+            this.tsbDeleteRole,
+            this.tsbSaveRole});
+          this.toolStrip5.Location = new System.Drawing.Point(0, 0);
+          this.toolStrip5.Name = "toolStrip5";
+          this.toolStrip5.Size = new System.Drawing.Size(1280, 25);
+          this.toolStrip5.TabIndex = 22;
+          this.toolStrip5.Text = "toolStrip5";
+          // 
+          // tspNewRole
+          // 
+          this.tspNewRole.Image = ((System.Drawing.Image)(resources.GetObject("tspNewRole.Image")));
+          this.tspNewRole.ImageTransparentColor = System.Drawing.Color.Magenta;
+          this.tspNewRole.Name = "tspNewRole";
+          this.tspNewRole.Size = new System.Drawing.Size(47, 22);
+          this.tspNewRole.Text = "new";
+          this.tspNewRole.Click += new System.EventHandler(this.tspNewRole_Click);
+          // 
+          // tsbDeleteRole
+          // 
+          this.tsbDeleteRole.Image = ((System.Drawing.Image)(resources.GetObject("tsbDeleteRole.Image")));
+          this.tsbDeleteRole.ImageTransparentColor = System.Drawing.Color.Magenta;
+          this.tsbDeleteRole.Name = "tsbDeleteRole";
+          this.tsbDeleteRole.Size = new System.Drawing.Size(57, 22);
+          this.tsbDeleteRole.Text = "delete";
+          this.tsbDeleteRole.Click += new System.EventHandler(this.tsbDeleteRole_Click);
+          // 
+          // tsbSaveRole
+          // 
+          this.tsbSaveRole.Image = ((System.Drawing.Image)(resources.GetObject("tsbSaveRole.Image")));
+          this.tsbSaveRole.ImageTransparentColor = System.Drawing.Color.Magenta;
+          this.tsbSaveRole.Name = "tsbSaveRole";
+          this.tsbSaveRole.Size = new System.Drawing.Size(50, 22);
+          this.tsbSaveRole.Text = "save";
+          this.tsbSaveRole.Click += new System.EventHandler(this.tsbSaveRole_Click);
+          // 
+          // cbxApplications
+          // 
+          this.cbxApplications.DisplayMember = "Name";
+          this.cbxApplications.FormattingEnabled = true;
+          this.cbxApplications.Location = new System.Drawing.Point(110, 6);
+          this.cbxApplications.Name = "cbxApplications";
+          this.cbxApplications.Size = new System.Drawing.Size(234, 21);
+          this.cbxApplications.TabIndex = 1;
+          this.cbxApplications.ValueMember = "Name";
+          this.cbxApplications.SelectedIndexChanged += new System.EventHandler(this.cbxApplications_SelectedIndexChanged);
+          // 
+          // label1
+          // 
+          this.label1.AutoSize = true;
+          this.label1.Location = new System.Drawing.Point(12, 9);
+          this.label1.Name = "label1";
+          this.label1.Size = new System.Drawing.Size(92, 13);
+          this.label1.TabIndex = 2;
+          this.label1.Text = "Select Application";
+          // 
+          // panel2
+          // 
+          this.panel2.Controls.Add(this.cbxApplications);
+          this.panel2.Controls.Add(this.label1);
+          this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
+          this.panel2.Location = new System.Drawing.Point(0, 0);
+          this.panel2.Name = "panel2";
+          this.panel2.Size = new System.Drawing.Size(1288, 33);
+          this.panel2.TabIndex = 3;
+          // 
+          // gbResetPassword
+          // 
+          this.gbResetPassword.Controls.Add(label2);
+          this.gbResetPassword.Controls.Add(this.tbPassword);
+          this.gbResetPassword.Controls.Add(this.btnResetPassword);
+          this.gbResetPassword.Location = new System.Drawing.Point(933, 94);
+          this.gbResetPassword.Name = "gbResetPassword";
+          this.gbResetPassword.Size = new System.Drawing.Size(308, 219);
+          this.gbResetPassword.TabIndex = 21;
+          this.gbResetPassword.TabStop = false;
+          this.gbResetPassword.Text = "Reset Password";
+          // 
+          // btnResetPassword
+          // 
+          this.btnResetPassword.Location = new System.Drawing.Point(52, 91);
+          this.btnResetPassword.Name = "btnResetPassword";
+          this.btnResetPassword.Size = new System.Drawing.Size(126, 23);
+          this.btnResetPassword.TabIndex = 0;
+          this.btnResetPassword.Text = "Reset Password";
+          this.btnResetPassword.UseVisualStyleBackColor = true;
+          this.btnResetPassword.Click += new System.EventHandler(this.btnResetPassword_Click);
+          // 
+          // tbPassword
+          // 
+          this.tbPassword.Location = new System.Drawing.Point(52, 51);
+          this.tbPassword.Name = "tbPassword";
+          this.tbPassword.Size = new System.Drawing.Size(100, 20);
+          this.tbPassword.TabIndex = 1;
+          // 
+          // label2
+          // 
+          label2.AutoSize = true;
+          label2.Location = new System.Drawing.Point(49, 35);
+          label2.Name = "label2";
+          label2.Size = new System.Drawing.Size(81, 13);
+          label2.TabIndex = 4;
+          label2.Text = "New Password:";
+          // 
+          // UserManagement
+          // 
+          this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+          this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+          this.ClientSize = new System.Drawing.Size(1288, 680);
+          this.Controls.Add(this.tcMain);
+          this.Controls.Add(this.panel2);
+          this.Name = "UserManagement";
+          this.Text = "UserManagement";
+          this.tcMain.ResumeLayout(false);
+          this.tpApplications.ResumeLayout(false);
+          this.tpApplications.PerformLayout();
+          ((System.ComponentModel.ISupportInitialize)(this.dgvApplications)).EndInit();
+          ((System.ComponentModel.ISupportInitialize)(this.applicationBindingSource)).EndInit();
+          this.panel1.ResumeLayout(false);
+          this.panel1.PerformLayout();
+          this.statusStrip1.ResumeLayout(false);
+          this.statusStrip1.PerformLayout();
+          this.toolStrip1.ResumeLayout(false);
+          this.toolStrip1.PerformLayout();
+          this.tpUsers.ResumeLayout(false);
+          this.tpUsers.PerformLayout();
+          ((System.ComponentModel.ISupportInitialize)(this.dgvUsers)).EndInit();
+          ((System.ComponentModel.ISupportInitialize)(this.userBindingSource2)).EndInit();
+          this.toolStrip2.ResumeLayout(false);
+          this.toolStrip2.PerformLayout();
+          this.panel3.ResumeLayout(false);
+          this.panel3.PerformLayout();
+          this.tableLayoutPanel1.ResumeLayout(false);
+          this.panel4.ResumeLayout(false);
+          this.panel4.PerformLayout();
+          ((System.ComponentModel.ISupportInitialize)(this.dgvUserRoles)).EndInit();
+          ((System.ComponentModel.ISupportInitialize)(this.roleBindingSource1)).EndInit();
+          this.toolStrip3.ResumeLayout(false);
+          this.toolStrip3.PerformLayout();
+          this.panel5.ResumeLayout(false);
+          this.panel5.PerformLayout();
+          ((System.ComponentModel.ISupportInitialize)(this.dgvUserRolesAll)).EndInit();
+          ((System.ComponentModel.ISupportInitialize)(this.roleBindingSource2)).EndInit();
+          this.toolStrip4.ResumeLayout(false);
+          this.toolStrip4.PerformLayout();
+          this.statusStrip2.ResumeLayout(false);
+          this.statusStrip2.PerformLayout();
+          this.tpRoles.ResumeLayout(false);
+          this.tpRoles.PerformLayout();
+          ((System.ComponentModel.ISupportInitialize)(this.dgvRoles)).EndInit();
+          ((System.ComponentModel.ISupportInitialize)(this.roleBindingSource)).EndInit();
+          this.panel6.ResumeLayout(false);
+          this.panel6.PerformLayout();
+          this.tableLayoutPanel2.ResumeLayout(false);
+          this.panel8.ResumeLayout(false);
+          this.panel8.PerformLayout();
+          ((System.ComponentModel.ISupportInitialize)(this.dgvRoleUsersAll)).EndInit();
+          ((System.ComponentModel.ISupportInitialize)(this.userBindingSource)).EndInit();
+          this.toolStrip7.ResumeLayout(false);
+          this.toolStrip7.PerformLayout();
+          this.panel7.ResumeLayout(false);
+          this.panel7.PerformLayout();
+          ((System.ComponentModel.ISupportInitialize)(this.dgvRoleUsers)).EndInit();
+          ((System.ComponentModel.ISupportInitialize)(this.userBindingSource1)).EndInit();
+          this.toolStrip6.ResumeLayout(false);
+          this.toolStrip6.PerformLayout();
+          this.statusStrip3.ResumeLayout(false);
+          this.statusStrip3.PerformLayout();
+          this.toolStrip5.ResumeLayout(false);
+          this.toolStrip5.PerformLayout();
+          this.panel2.ResumeLayout(false);
+          this.panel2.PerformLayout();
+          this.gbResetPassword.ResumeLayout(false);
+          this.gbResetPassword.PerformLayout();
+          this.ResumeLayout(false);
 
         }
@@ -968 +1117 @@
         private System.Windows.Forms.TabPage tpApplications;
         private System.Windows.Forms.DataGridView dgvApplications;
-        private System.Windows.Forms.BindingSource bsApplications;
         private System.Windows.Forms.TabPage tpUsers;
         private System.Windows.Forms.DataGridView dgvUsers;
-        private System.Windows.Forms.BindingSource bsUsers;
         private System.Windows.Forms.TabPage tpRoles;
         private System.Windows.Forms.DataGridView dgvRoles;
-        private System.Windows.Forms.BindingSource bsRoles;
         private System.Windows.Forms.ComboBox cbxApplications;
+        private System.Windows.Forms.DataGridViewTextBoxColumn loweredApplicationNameDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn loweredRoleNameDataGridViewTextBoxColumn;
+        private System.Windows.Forms.TextBox tbApplicationDescription;
+        private System.Windows.Forms.TextBox tbApplicationName;
+        private System.Windows.Forms.TextBox tbUserName;
+        private System.Windows.Forms.TextBox tbUserEmail;
+        private System.Windows.Forms.TextBox tbUserComment;
+        private System.Windows.Forms.TextBox tbRoleDescription;
+        private System.Windows.Forms.TextBox tbRoleName;
+        private System.Windows.Forms.DataGridView dgvUserRolesAll;
+        private System.Windows.Forms.DataGridView dgvRoleUsersAll;
+        private System.Windows.Forms.DataGridView dgvRoleUsers;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.ToolStrip toolStrip1;
+        private System.Windows.Forms.ToolStripButton tspNewApplication;
+        private System.Windows.Forms.ToolStripButton tspDeleteApplication;
+        private System.Windows.Forms.ToolStripButton tspSaveApplication;
+        private System.Windows.Forms.StatusStrip statusStrip1;
+        private System.Windows.Forms.ToolStripStatusLabel tssApplicationStatus;
+        private System.Windows.Forms.BindingSource applicationBindingSource;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.ToolStrip toolStrip2;
+        private System.Windows.Forms.Panel panel3;
+        private System.Windows.Forms.StatusStrip statusStrip2;
+        private System.Windows.Forms.ToolStripStatusLabel tssStatusUser;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.ToolStripButton tsbNewUser;
+        private System.Windows.Forms.ToolStripButton tsbDeleteUser;
+        private System.Windows.Forms.ToolStripButton tsbSaveUser;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.Panel panel4;
+        private System.Windows.Forms.ToolStrip toolStrip3;
+        private System.Windows.Forms.ToolStripButton tsbRemoveRoleFromUser;
+        private System.Windows.Forms.DataGridView dgvUserRoles;
+        private System.Windows.Forms.Panel panel5;
+        private System.Windows.Forms.ToolStrip toolStrip4;
+        private System.Windows.Forms.ToolStripButton tsbAddRoleToUser;
+        private System.Windows.Forms.ToolStrip toolStrip5;
+        private System.Windows.Forms.ToolStripButton tspNewRole;
+        private System.Windows.Forms.ToolStripButton tsbDeleteRole;
+        private System.Windows.Forms.ToolStripButton tsbSaveRole;
+        private System.Windows.Forms.StatusStrip statusStrip3;
+        private System.Windows.Forms.ToolStripStatusLabel tssStatusRole;
+        private System.Windows.Forms.Panel panel7;
+        private System.Windows.Forms.ToolStrip toolStrip6;
+        private System.Windows.Forms.Panel panel6;
+        private System.Windows.Forms.ToolStripButton tsbRemoveUserFromRole;
+        private System.Windows.Forms.Panel panel8;
+        private System.Windows.Forms.ToolStrip toolStrip7;
+        private System.Windows.Forms.ToolStripButton tsbAddUserToRole;
+        private System.Windows.Forms.DataGridViewTextBoxColumn idDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colDescription;
+        private System.Windows.Forms.DataGridViewTextBoxColumn idDataGridViewTextBoxColumn2;
         private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn loweredApplicationNameDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn emailDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn descriptionDataGridViewTextBoxColumn;
+        private System.Windows.Forms.BindingSource userBindingSource2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn4;
+        private System.Windows.Forms.BindingSource roleBindingSource1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn5;
+        private System.Windows.Forms.BindingSource roleBindingSource2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn idDataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn descriptionDataGridViewTextBoxColumn1;
+        private System.Windows.Forms.BindingSource roleBindingSource;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
         private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn emailDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn commentDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn lastLoginDateDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn lastPasswordChangeDateDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn lastLockoutDateDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn lastActivityDateDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn isLookedOutDataGridViewCheckBoxColumn;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn isApprovedDataGridViewCheckBoxColumn;
+        private System.Windows.Forms.BindingSource userBindingSource;
         private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn loweredRoleNameDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn descriptionDataGridViewTextBoxColumn1;
-        private System.Windows.Forms.Button btnDeleteApplication;
-        private System.Windows.Forms.TextBox descriptionTextBox;
-        private System.Windows.Forms.TextBox loweredApplicationNameTextBox;
-        private System.Windows.Forms.TextBox nameTextBox;
-        private System.Windows.Forms.Button btnNewApplication;
-        private System.Windows.Forms.Button btnUpdateApplication;
-        private System.Windows.Forms.TextBox passwordSaltTextBox;
-        private System.Windows.Forms.TextBox passwordTextBox;
-        private System.Windows.Forms.TextBox nameTextBox1;
-        private System.Windows.Forms.CheckBox isApprovedCheckBox;
-        private System.Windows.Forms.TextBox emailTextBox;
-        private System.Windows.Forms.TextBox commentTextBox;
-        private System.Windows.Forms.TextBox descriptionTextBox1;
-        private System.Windows.Forms.TextBox loweredRoleNameTextBox;
-        private System.Windows.Forms.TextBox nameTextBox2;
-        private System.Windows.Forms.Button btnUpdateRole;
-        private System.Windows.Forms.Button btnDeleteRole;
-        private System.Windows.Forms.Button btnNewRole;
-        private System.Windows.Forms.Button btnUpdateUser;
-        private System.Windows.Forms.Button btnDeleteUser;
-        private System.Windows.Forms.Button btnNewUser;
-        private System.Windows.Forms.TabControl tcUser;
-        private System.Windows.Forms.TabPage tabPage1;
-        private System.Windows.Forms.TabPage tabPage2;
-        private System.Windows.Forms.Button btnAddRoleToUser;
-        private System.Windows.Forms.Button btnRemoveRoleFromUser;
-        private System.Windows.Forms.DataGridView dgvUserRolesAll;
-        private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn4;
-        private System.Windows.Forms.DataGridView dgvUserRoles;
-        private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn3;
-        private System.Windows.Forms.BindingSource bsUserRoles;
-        private System.Windows.Forms.TabControl tcRole;
-        private System.Windows.Forms.TabPage tabPage3;
-        private System.Windows.Forms.TabPage tabPage4;
-        private System.Windows.Forms.BindingSource bsRoleUsers;
-        private System.Windows.Forms.Button btnAddUserToRole;
-        private System.Windows.Forms.Button btnRemoveUserFromRole;
-        private System.Windows.Forms.DataGridView dgvRoleUsersAll;
-        private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn6;
-        private System.Windows.Forms.DataGridView dgvRoleUsers;
-        private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn5;
-        private System.Windows.Forms.BindingSource bsApplicationsCombo;
+        private System.Windows.Forms.BindingSource userBindingSource1;
+        private System.Windows.Forms.GroupBox gbResetPassword;
+        private System.Windows.Forms.TextBox tbPassword;
+        private System.Windows.Forms.Button btnResetPassword;
     }
 }

branches/UserManagement/HeuristicLab.Services.Authentication.TestClient2/UserManagement.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab 
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * 
+ * This file is part of HeuristicLab. 
+ * 
+ * HeuristicLab is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * HeuristicLab is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 
+ */
+#endregion
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -8 +28 @@
 using System.Windows.Forms;
 
-namespace HeuristicLab.Services.Authentication.TestClient2
-{
-    public partial class UserManagement : Form
-    {
-
-        private AuthenticationService auth;
-        private DataTransfer.Application currentApplication;
-
-        private DataTransfer.Application selectedApplication;
-        private DataTransfer.User selectedUser;
-        private DataTransfer.Role selectedRole;
-
-        public UserManagement()
-        {
-            InitializeComponent();
-            Initialize();
-        }
-
-        private void Initialize()
-        {
-            auth = new AuthenticationService();
-            bsApplications.DataSource = auth.GetApplications();
-            bsApplicationsCombo.DataSource = auth.GetApplications();
-            RefreshLists();
-        }
-
-        private void RefreshLists()
-        {
-            if (currentApplication != null)
-            {
-                bsRoles.DataSource = auth.GetRoles(currentApplication.Id);
-                bsUsers.DataSource = auth.GetUsers(currentApplication.Id);
-            }
-        }
-
-        private void cbxApplications_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            this.currentApplication = (HeuristicLab.Services.Authentication.DataTransfer.Application)cbxApplications.SelectedItem;
-            RefreshLists();
-        }
-
-        private void btnNewApplication_Click(object sender, EventArgs e)
-        {
-            // new
-           //DataTransfer.Application  = new DataTransfer.Application();
-            selectedApplication = (DataTransfer.Application)this.bsApplications.AddNew();
-            
-        }
-
-        private void btnDeleteApplication_Click(object sender, EventArgs e)
-        {
-            if (this.dgvApplications.SelectedRows.Count > 0)
-            {
-                selectedApplication= ( DataTransfer.Application)this.dgvApplications.SelectedRows[0].DataBoundItem;
-                if (selectedApplication != null)
-                {
-                    auth.DeleteApplication(selectedApplication.Id);
-                    RefreshLists();
-                }
-            }
-        }
-
-        private void btnUpdateApplication_Click(object sender, EventArgs e)
-        {
-           
-                if (selectedApplication != null)
-                {
-                    if (selectedApplication.Id.Equals(Guid.Empty))
-                    {
-                        // insert
-                        selectedApplication.Id = Guid.NewGuid();
-                        auth.AddApplication(selectedApplication);
-                    }
-                    else
-                    {
-                        // update
-                        auth.UpdateApplication(selectedApplication);
-                    }
-                }
-            
-            
-        }
-
-        private void dgvApplications_SelectionChanged(object sender, EventArgs e)
-        {
-            if (dgvApplications.SelectedRows.Count > 0)
-            {
-                selectedApplication = (DataTransfer.Application)dgvApplications.SelectedRows[0].DataBoundItem;
-            }
-        }
-
-        private void dgvUsers_SelectionChanged(object sender, EventArgs e)
-        {
-            if (dgvUsers.SelectedRows.Count > 0)
-            {
-                selectedUser = (DataTransfer.User)dgvUsers.SelectedRows[0].DataBoundItem;
-                RefreshUserRolesList();
-            }
-        }
-
-        private void dgvRoles_SelectionChanged(object sender, EventArgs e)
-        {
-            if (dgvRoles.SelectedRows.Count > 0)
-            {
-                selectedRole = (DataTransfer.Role)dgvRoles.SelectedRows[0].DataBoundItem;
-                RefreshRoleUsersList();
-            }
-        }
-
-        private void btnUpdateRole_Click(object sender, EventArgs e)
-        {
-            if (selectedRole != null)
-            {
-                if (selectedRole.Id.Equals(Guid.Empty))
-                {
-                    // insert
-                    selectedRole.Id = Guid.NewGuid();
-                    selectedRole.ApplicationId = currentApplication.Id;
-
-                    auth.AddRole(selectedRole);
-                }
-                else
-                {
-                    // update
-                    auth.UpdateRole(selectedRole);
-                }
-            }
-        }
-
-        private void btnNewRole_Click(object sender, EventArgs e)
-        {
-            selectedRole = (DataTransfer.Role)this.bsRoles.AddNew();
-        }
-
-        private void btnDeleteRole_Click(object sender, EventArgs e)
-        {
-            if (this.dgvRoles.SelectedRows.Count > 0)
-            {
-                selectedRole = (DataTransfer.Role)this.dgvRoles.SelectedRows[0].DataBoundItem;
-                if (selectedRole != null)
-                {
-                    auth.DeleteRole(selectedRole.Id);
-                    RefreshLists();
-                }
-            }
-        }
-
-        private void btnNewUser_Click(object sender, EventArgs e)
-        {
-            selectedUser = (DataTransfer.User)this.bsUsers.AddNew();
-        }
-
-        private void btnDeleteUser_Click(object sender, EventArgs e)
-        {
-            if (this.dgvUsers.SelectedRows.Count > 0)
-            {
-                selectedUser = (DataTransfer.User)this.dgvUsers.SelectedRows[0].DataBoundItem;
-                if (selectedUser != null)
-                {
-                    auth.DeleteUser(selectedUser.Id);
-                    RefreshLists();
-                }
-            }
-        }
-
-        private void btnUpdateUser_Click(object sender, EventArgs e)
-        {
-            if (selectedUser != null)
-            {
-                if (selectedUser.Id.Equals(Guid.Empty))
-                {
-                    // insert
-                    selectedUser.Id = Guid.NewGuid();
-                    selectedUser.ApplicationId = currentApplication.Id;
-
-                    auth.AddUser(selectedUser);
-                }
-                else
-                {
-                    // update
-                    auth.UpdateUser(selectedUser);
-                }
-            }
-        }
-
-        private void btnRemoveRoleFromUser_Click(object sender, EventArgs e)
-        {
-            if (this.dgvUserRoles.SelectedRows.Count > 0)
-            {
-
-                DataTransfer.Role role = (DataTransfer.Role)this.dgvUserRoles.SelectedRows[0].DataBoundItem;
-                if (role != null)
-                {
-                    auth.RemoveUserFromRole(role.Id, selectedUser.Id);
-                    RefreshUserRolesList();
-                }
-            }
-        }
-
-        private void btnAddRoleToUser_Click(object sender, EventArgs e)
-        {
-            if (this.dgvUserRolesAll.SelectedRows.Count > 0)
-            {
-                DataTransfer.Role role = (DataTransfer.Role)this.dgvUserRolesAll.SelectedRows[0].DataBoundItem;
-                if (role != null)
-                {
-                    auth.AddUserToRole( role.Id,selectedUser.Id);
-                    RefreshUserRolesList();
-                }
-            }
-        }
-
-        private void RefreshUserRolesList()
-        {
-            bsUserRoles.DataSource = auth.GetRolesForUser(selectedUser.Id);
-        }
-
-        private void RefreshRoleUsersList()
-        {
-            bsRoleUsers.DataSource = auth.GetUsersInRole(selectedRole.Id);
-        }
-
-        private void btnRemoveUserFromRole_Click(object sender, EventArgs e)
-        {
-            if (this.dgvRoleUsers.SelectedRows.Count > 0)
-            {
-
-                DataTransfer.User user = (DataTransfer.User)this.dgvRoleUsers.SelectedRows[0].DataBoundItem;
-                if (user != null)
-                {
-                    auth.RemoveUserFromRole(selectedRole.Id, user.Id);
-                    RefreshRoleUsersList();
-                }
-            }
-        }
-
-        private void btnAddUserToRole_Click(object sender, EventArgs e)
-        {
-            if (this.dgvRoleUsersAll.SelectedRows.Count > 0)
-            {
-                DataTransfer.User user = (DataTransfer.User)this.dgvRoleUsersAll.SelectedRows[0].DataBoundItem;
-                if (user != null)
-                {
-                    auth.AddUserToRole(selectedRole.Id, user.Id);
-                    RefreshRoleUsersList();
-                }
-            }
-        }
-
-  
-    }
+namespace HeuristicLab.Services.Authentication {
+  public partial class UserManagement : Form {
+
+    private Application currentApplication;
+    private Application selectedApplication;
+    private User selectedUser;
+    private Role selectedRole;
+
+    private List<Application> applications;
+    private List<User> users;
+    private List<Role> roles;
+
+
+    public UserManagement() {
+      InitializeComponent();
+      Initialize();
+    }
+
+
+    private void Initialize() {
+      AuthenticationClient.Instance.Refreshed += new EventHandler(Instance_Refreshed);
+      cbxApplications.DataSource = AuthenticationClient.Instance.GetApplications();
+    }
+
+
+    void Instance_Refreshed(object sender, EventArgs e) {
+
+      if (InvokeRequired) {
+        Invoke(new EventHandler(Instance_Refreshed), sender, e);
+      } else {
+
+        applications = AuthenticationClient.Instance.Applications.ToList();
+        dgvApplications.DataSource = applications;
+
+        roles = AuthenticationClient.Instance.Roles.ToList();
+        dgvRoles.DataSource = roles;
+
+        users = AuthenticationClient.Instance.Users.ToList();
+        dgvUsers.DataSource = users;
+      }
+
+    }
+
+
+    private void RefreshApplications() {
+      if (currentApplication != null) {
+        AuthenticationClient.Instance.Refresh(currentApplication.Id);
+      }
+    }
+
+
+
+    private void RefreshUsersAndRoles() {
+
+
+      if (currentApplication != null) {
+        AuthenticationClient.Instance.Refresh(currentApplication.Id);
+      }
+    }
+
+
+
+    private void cbxApplications_SelectedIndexChanged(object sender, EventArgs e) {
+      this.currentApplication = (HeuristicLab.Services.Authentication.Application)cbxApplications.SelectedItem;
+      if (currentApplication != null) {
+        AuthenticationClient.Instance.Refresh(currentApplication.Id);
+      }
+    }
+
+
+
+
+    private void dgvApplications_SelectionChanged(object sender, EventArgs e) {
+      if (dgvApplications.SelectedRows.Count > 0) {
+        selectedApplication = (HeuristicLab.Services.Authentication.Application)dgvApplications.SelectedRows[0].DataBoundItem;
+
+        if (selectedApplication != null) {
+          tbApplicationName.Text = selectedApplication.Name;
+          tbApplicationDescription.Text = selectedApplication.Description;
+          selectedApplication.PropertyChanged += new PropertyChangedEventHandler(selectedApplication_PropertyChanged);
+        }
+      }
+    }
+
+
+
+    void selectedApplication_PropertyChanged(object sender, PropertyChangedEventArgs e) {
+      if (selectedApplication.Modified) {
+        tssApplicationStatus.Text = "modified";
+      } else {
+        tssApplicationStatus.Text = "";
+      }
+    }
+
+
+
+
+    private void dgvUsers_SelectionChanged(object sender, EventArgs e) {
+      if (dgvUsers.SelectedRows.Count > 0) {
+        selectedUser = (HeuristicLab.Services.Authentication.User)dgvUsers.SelectedRows[0].DataBoundItem;
+
+        if (selectedUser != null) {
+          tbUserComment.Text = selectedUser.Description;
+          tbUserEmail.Text = selectedUser.Email;
+          tbUserName.Text = selectedUser.Name;
+          selectedUser.PropertyChanged += new PropertyChangedEventHandler(selectedUser_PropertyChanged);
+          RefreshUserRolesList();
+        }
+        RefreshUserRolesList();
+      }
+    }
+
+    void selectedUser_PropertyChanged(object sender, PropertyChangedEventArgs e) {
+      if (selectedUser.Modified) {
+        tssStatusUser.Text = "modified";
+      } else {
+        tssStatusUser.Text = "";
+      }
+    }
+
+
+
+    private void dgvRoles_SelectionChanged(object sender, EventArgs e) {
+      if (dgvRoles.SelectedRows.Count > 0) {
+        selectedRole = (HeuristicLab.Services.Authentication.Role)dgvRoles.SelectedRows[0].DataBoundItem;
+
+        if (selectedRole != null) {
+          tbRoleName.Text = selectedRole.Name;
+          tbRoleDescription.Text = selectedRole.Description;
+          selectedRole.PropertyChanged += new PropertyChangedEventHandler(selectedRole_PropertyChanged);
+        }
+
+        RefreshRoleUsersList();
+      }
+    }
+
+    void selectedRole_PropertyChanged(object sender, PropertyChangedEventArgs e) {
+      if (selectedRole.Modified) {
+        tssStatusRole.Text = "modified";
+      } else {
+        tssStatusRole.Text = "";
+      }
+    }
+
+
+
+    private void RefreshUserRolesList() {
+      IEnumerable<Guid> guidList = AuthenticationClient.Instance.GetRolesForUser(selectedUser.Id);
+      List<Role> rolesForUser = new List<Role>();
+      if (guidList != null) {
+        foreach (Guid g in guidList) {
+          rolesForUser.Add(AuthenticationClient.Instance.GetRole(g));
+        }
+      }
+      dgvUserRoles.DataSource = rolesForUser;
+      dgvUserRolesAll.DataSource = AuthenticationClient.Instance.Roles;
+
+    }
+
+
+
+    private void RefreshRoleUsersList() {
+
+      IEnumerable<Guid> guidList = AuthenticationClient.Instance.GetUsersInRole(selectedRole.Id);
+
+      List<User> usersForRole = new List<User>();
+
+      if (guidList != null) {
+        foreach (Guid g in guidList) {
+          usersForRole.Add(AuthenticationClient.Instance.GetUser(g));
+        }
+      }
+
+      dgvRoleUsers.DataSource = usersForRole;
+      dgvRoleUsersAll.DataSource = AuthenticationClient.Instance.Users;
+    }
+
+
+    private void tbApplicationName_TextChanged(object sender, EventArgs e) {
+      if (selectedApplication != null) {
+        selectedApplication.Name = tbApplicationName.Text;
+      }
+    }
+
+    private void tbApplicationDescription_TextChanged(object sender, EventArgs e) {
+      if (selectedApplication != null) {
+        selectedApplication.Description = tbApplicationDescription.Text;
+      }
+    }
+
+    private void tbRoleName_TextChanged(object sender, EventArgs e) {
+      if (selectedRole != null) {
+        selectedRole.Name = tbRoleName.Text;
+      }
+    }
+
+    private void tbRoleDescription_TextChanged(object sender, EventArgs e) {
+      if (selectedRole != null) {
+        selectedRole.Description = tbRoleDescription.Text;
+      }
+    }
+
+    private void tbUserComment_TextChanged(object sender, EventArgs e) {
+      if (selectedUser != null) {
+        selectedUser.Description = tbUserComment.Text;
+      }
+    }
+
+    private void tbUserName_TextChanged(object sender, EventArgs e) {
+      if (selectedUser != null) {
+        selectedUser.Name = tbUserName.Text;
+      }
+    }
+
+    private void tbUserEmail_TextChanged(object sender, EventArgs e) {
+      if (selectedUser != null) {
+        selectedUser.Email = tbUserEmail.Text;
+      }
+    }
+
+
+    private void tspNewApplication_Click(object sender, EventArgs e) {
+      selectedApplication = new Application();
+      tbApplicationDescription.Text = "";
+      tbApplicationName.Text = "";
+    }
+
+    private void tspDeleteApplication_Click(object sender, EventArgs e) {
+      if (this.dgvApplications.SelectedRows.Count > 0) {
+        selectedApplication = (HeuristicLab.Services.Authentication.Application)this.dgvApplications.SelectedRows[0].DataBoundItem;
+        if (selectedApplication != null) {
+          AuthenticationClient.Instance.Applications.Remove(selectedApplication);
+          RefreshApplications();
+        }
+      }
+    }
+
+    private void tspSaveApplication_Click(object sender, EventArgs e) {
+      if (selectedApplication != null) {
+        selectedApplication.Store();
+        if (currentApplication != null) {
+          AuthenticationClient.Instance.Refresh(currentApplication.Id);
+        }
+      }
+
+    }
+
+    private void tsbNewUser_Click(object sender, EventArgs e) {
+      selectedUser = new User();
+      selectedUser.ApplicationId = currentApplication.Id;
+      selectedUser.CreateDate = DateTime.Now;
+      selectedUser.LastActivityDate = DateTime.Now;
+      selectedUser.LastLoginDate = DateTime.Now;
+      selectedUser.LastLockoutDate = DateTime.Now;
+      selectedUser.LastPasswordChangeDate = DateTime.Now;
+
+      tbUserComment.Text = "";
+      tbUserEmail.Text = "";
+      tbUserName.Text = "";
+    }
+
+    private void tsbDeleteUser_Click(object sender, EventArgs e) {
+      if (this.dgvUsers.SelectedRows.Count > 0) {
+        selectedUser = (HeuristicLab.Services.Authentication.User)this.dgvUsers.SelectedRows[0].DataBoundItem;
+        if (selectedUser != null) {
+          AuthenticationClient.Instance.Users.Remove(selectedUser);
+          RefreshUsersAndRoles();
+        }
+      }
+    }
+
+    private void tsbSaveUser_Click(object sender, EventArgs e) {
+      if (selectedUser != null) {
+        selectedUser.Store();
+        if (currentApplication != null) {
+          AuthenticationClient.Instance.Refresh(currentApplication.Id);
+        }
+      }
+    }
+
+    private void tsbRemoveRoleFromUser_Click(object sender, EventArgs e) {
+      if (this.dgvUserRoles.SelectedRows.Count > 0) {
+
+        HeuristicLab.Services.Authentication.Role role = (HeuristicLab.Services.Authentication.Role)this.dgvUserRoles.SelectedRows[0].DataBoundItem;
+        if (role != null) {
+          AuthenticationClient.Instance.RemoveUserFromRole(role.Id, selectedUser.Id);
+          RefreshUserRolesList();
+        }
+      }
+    }
+
+    private void tsbAddRoleToUser_Click(object sender, EventArgs e) {
+      if (this.dgvUserRolesAll.SelectedRows.Count > 0) {
+        HeuristicLab.Services.Authentication.Role role = (HeuristicLab.Services.Authentication.Role)this.dgvUserRolesAll.SelectedRows[0].DataBoundItem;
+        if (role != null) {
+          if (!AuthenticationClient.Instance.IsUserInRole(selectedUser.Id, role.Id)) {
+            AuthenticationClient.Instance.AddUserToRole(role.Id, selectedUser.Id);
+            RefreshUserRolesList();
+          }
+        }
+      }
+    }
+
+    private void tspNewRole_Click(object sender, EventArgs e) {
+      selectedRole = new Role();
+      selectedRole.ApplicationId = currentApplication.Id;
+      tbRoleDescription.Text = "";
+      tbRoleName.Text = "";
+    }
+
+
+    private void tsbDeleteRole_Click(object sender, EventArgs e) {
+      if (this.dgvRoles.SelectedRows.Count > 0) {
+        selectedRole = (HeuristicLab.Services.Authentication.Role)this.dgvRoles.SelectedRows[0].DataBoundItem;
+        if (selectedRole != null) {
+          AuthenticationClient.Instance.Roles.Remove(selectedRole);
+          RefreshUsersAndRoles();
+        }
+      }
+    }
+
+
+    private void tsbSaveRole_Click(object sender, EventArgs e) {
+      if (selectedRole != null) {
+        selectedRole.Store();
+        if (currentApplication != null) {
+          AuthenticationClient.Instance.Refresh(currentApplication.Id);
+        }
+      }
+    }
+
+    private void tsbRemoveUserFromRole_Click(object sender, EventArgs e) {
+      if (this.dgvRoleUsers.SelectedRows.Count > 0) {
+
+        HeuristicLab.Services.Authentication.User user = (HeuristicLab.Services.Authentication.User)this.dgvRoleUsers.SelectedRows[0].DataBoundItem;
+        if (user != null) {
+          AuthenticationClient.Instance.RemoveUserFromRole(selectedRole.Id, user.Id);
+          RefreshRoleUsersList();
+        }
+      }
+    }
+
+    private void tsbAddUserToRole_Click(object sender, EventArgs e) {
+      if (this.dgvRoleUsersAll.SelectedRows.Count > 0) {
+        HeuristicLab.Services.Authentication.User user = (HeuristicLab.Services.Authentication.User)this.dgvRoleUsersAll.SelectedRows[0].DataBoundItem;
+        if (user != null) {
+          if (!AuthenticationClient.Instance.IsUserInRole(user.Id, selectedRole.Id)) {
+            AuthenticationClient.Instance.AddUserToRole(selectedRole.Id, user.Id);
+            RefreshRoleUsersList();
+          }
+        }
+      }
+    }
+
+
+    private void btnResetPassword_Click(object sender, EventArgs e) {
+
+      string applicationName = currentApplication.Name;
+      string userName = selectedUser.Name;
+      string password = tbPassword.Text;
+
+      AuthenticationClient.Instance.ResetPassword(applicationName, userName, password);
+    }
+  }
 }

branches/UserManagement/HeuristicLab.Services.Authentication.TestClient2/UserManagement.resx

@@ -121 +121 @@
     <value>False</value>
   </metadata>
-  <metadata name="loweredApplicationNameLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <metadata name="nameLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
@@ -133 +130 @@
     <value>False</value>
   </metadata>
-  <metadata name="isApprovedLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <metadata name="nameLabel1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="passwordLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="passwordSaltLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <metadata name="nameLabel2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="loweredRoleNameLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <metadata name="descriptionLabel1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="bsApplications.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>188, 17</value>
-  </metadata>
-  <metadata name="bsUsers.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>319, 17</value>
-  </metadata>
-  <metadata name="bsRoles.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>413, 17</value>
-  </metadata>
-  <metadata name="bsUserRoles.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>506, 17</value>
-  </metadata>
-  <metadata name="bsRoleUsers.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>624, 17</value>
-  </metadata>
-  <metadata name="bsApplicationsCombo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="colName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colDescription.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="applicationBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>226, 17</value>
+  </metadata>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>116, 17</value>
+  </metadata>
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="tspNewApplication.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL
+        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI
+        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ
+        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4
+        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9
+        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j
+        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR
+        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb
+        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE
+        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="tspDeleteApplication.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL
+        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI
+        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ
+        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4
+        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9
+        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j
+        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR
+        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb
+        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE
+        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="tspSaveApplication.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL
+        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI
+        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ
+        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4
+        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9
+        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j
+        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR
+        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb
+        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE
+        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <metadata name="userBindingSource2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>452, 54</value>
+  </metadata>
+  <metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>402, 17</value>
+  </metadata>
+  <data name="tsbNewUser.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL
+        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI
+        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ
+        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4
+        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9
+        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j
+        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR
+        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb
+        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE
+        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="tsbDeleteUser.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL
+        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI
+        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ
+        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4
+        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9
+        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j
+        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR
+        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb
+        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE
+        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="tsbSaveUser.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL
+        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI
+        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ
+        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4
+        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9
+        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j
+        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR
+        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb
+        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE
+        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="roleBindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>602, 54</value>
+  </metadata>
+  <metadata name="toolStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>611, 17</value>
+  </metadata>
+  <data name="tsbRemoveRoleFromUser.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL
+        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI
+        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ
+        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4
+        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9
+        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j
+        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR
+        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb
+        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE
+        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <metadata name="roleBindingSource2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>749, 54</value>
+  </metadata>
+  <metadata name="toolStrip4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>710, 17</value>
+  </metadata>
+  <data name="tsbAddRoleToUser.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL
+        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI
+        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ
+        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4
+        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9
+        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j
+        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR
+        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb
+        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE
+        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <metadata name="statusStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>501, 17</value>
+  </metadata>
+  <metadata name="roleBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>311, 54</value>
+  </metadata>
+  <metadata name="userBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 54</value>
+  </metadata>
+  <metadata name="toolStrip7.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1117, 17</value>
+  </metadata>
+  <data name="tsbAddUserToRole.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL
+        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI
+        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ
+        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4
+        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9
+        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j
+        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR
+        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb
+        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE
+        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <metadata name="userBindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>161, 54</value>
+  </metadata>
+  <metadata name="toolStrip6.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1018, 17</value>
+  </metadata>
+  <data name="tsbRemoveUserFromRole.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL
+        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI
+        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ
+        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4
+        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9
+        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j
+        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR
+        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb
+        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE
+        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <metadata name="statusStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>908, 17</value>
+  </metadata>
+  <metadata name="toolStrip5.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>809, 17</value>
+  </metadata>
+  <data name="tspNewRole.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL
+        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI
+        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ
+        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4
+        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9
+        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j
+        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR
+        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb
+        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE
+        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="tsbDeleteRole.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL
+        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI
+        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ
+        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4
+        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9
+        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j
+        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR
+        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb
+        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE
+        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="tsbSaveRole.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL
+        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI
+        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ
+        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4
+        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9
+        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j
+        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR
+        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb
+        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE
+        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
+</value>
+  </data>
 </root>

branches/UserManagement/HeuristicLab.Services.Authentication.TestClient2/app.config

@@ -28 +28 @@
                 contract="HeuristicLab.Services.Authentication.IAuthenticationService"
                 name="WSHttpBinding_IAuthenticationService">
-                <identity>
-                    <certificate encodedValue="AwAAAAEAAAAUAAAAXL2k/dCMiB3+7a8y6zepgAUMPdcgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhB0J9LOt5NHpkN1DGclpr/0MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDkyMTE4MDIwN1oXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC73VKB25OrytpquyozHwo7d711Z4KEQEWHIigtJufMBUIzpQWXQrySaYrOdjZxuDJE8M7+kUi6FJny3o48Z8ZEEIKdoy4fJ+o5+rXKKNyg3rZxae1KJm4kQ3rIRu68b3cu6EYvFymORNo+gv8A03IbA2F7K1vaQbuRDAdbP8CT+QIDAQABo0kwRzBFBgNVHQEEPjA8gBC/lrDi96sGW7ZLNecSjhFEoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghB0J9LOt5NHpkN1DGclpr/0MAkGBSsOAwIdBQADgYEAdls1HmJKAhEUZvCcg/ELZYpRHF3ds5mHsYrNNhEoUTrHYJzsXDqxLMyn9nbKQHv+kBH7tdgF61agYvy3666D7EHPMXyEk6OwCVxIvOyNaHywS0v7/fyU/394VpzFNmkuycaiemEZFhqxstKN6n4PzBqOJfUmIE9Ry/mnlp6T2Zo=" />
-                </identity>
+              <identity>
+                <certificate encodedValue="AwAAAAEAAAAUAAAAcW5qweN5KE/c7vDfiOgOVK9MmdUgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBNYVKrw/XEtUXaCrJWdRQ3MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTIxMDEyNDEzOFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDcDRvCjtxUsUVe09hYQopTYzqvWEkVmwQhm3L/ZsYL5OXzfmGlT7/sL5SzWzlWrdDIMjW/H65bR50IxvgZ3B/N7x5jnvaV9wIH3000XYHMxKLoTzhths7OjU0uFHnQcI4mzhm6WralCag/wonW5T36pW8s2PixqUBecZZw0hBlbwIDAQABo0kwRzBFBgNVHQEEPjA8gBDjWp8J1q9QALL3wjJ/Q0j5oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBNYVKrw/XEtUXaCrJWdRQ3MAkGBSsOAwIdBQADgYEADaAsqAYk9qAuzyzkG6i2dCo1lOFuwKobPDzFJ7i3DvIeG8M9b+3JonFJiHItHEG2la82m+kCwV/uedicGdonSzG2WJwh3RqZq6CAlw8mz883npGD0w119XADxSZy+X4Tg6qrePVtWyH2MnKUMb7UTtwgRMhJrrdweP+ysdyue0o=" />
+              </identity>
             </endpoint>
         </client>

branches/UserManagement/HeuristicLab.Services.Authentication/AuthenticationService.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab 
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * 
+ * This file is part of HeuristicLab. 
+ * 
+ * HeuristicLab is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * HeuristicLab is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8 +29 @@
 using System.Diagnostics;
 
-namespace HeuristicLab.Services.Authentication
-{
-    [ServiceBehavior(IncludeExceptionDetailInFaults = true)]
-    public class AuthenticationService : IAuthenticationService
-    {
-
-        #region User
-
-
-        public DataTransfer.User GetUser(Guid id)
-        {
-            using (UserManagementDataContext db = new UserManagementDataContext())
-            {
-                var user = db.aspnet_Users.Where(x => x.UserId == id).FirstOrDefault();
-                var membership = db.aspnet_Memberships.Where(x => x.UserId == id).FirstOrDefault();
-
-
-                return Convert.ToDataTransfer(user, membership);
-
-
-            }
-        }
-
-        public IEnumerable<DataTransfer.User> GetAllUsers() {
-          List<DataTransfer.User> userList = new List<DataTransfer.User>();
-          using (UserManagementDataContext db = new UserManagementDataContext()) {
-            var users = db.aspnet_Users.ToList<aspnet_User>();
-            foreach (aspnet_User user in users) {
-              var membership = db.aspnet_Memberships.Where(x => x.UserId == user.UserId).FirstOrDefault();
-              userList.Add(Convert.ToDataTransfer(user, membership));
-            }
-          }
-
-          return userList;
-        }
-
-        public IEnumerable<DataTransfer.User> GetUsers(Guid applicationId)
-        {
-            List<DataTransfer.User> userList = new List<DataTransfer.User>();
-            using (UserManagementDataContext db = new UserManagementDataContext())
-            {
-                var users = db.aspnet_Users.Where(x => x.ApplicationId == applicationId).ToList<aspnet_User>();
-
-                foreach (aspnet_User user in users)
-                {
-                    var membership = db.aspnet_Memberships.Where(x => x.UserId == user.UserId).FirstOrDefault();
-
-                    userList.Add(Convert.ToDataTransfer(user, membership));
-
-                }
-
-
-
-            }
-            return userList;
-        }
-
-        public Guid AddUser(User user)
-        {
-            if (user != null)
-            {
-                using (UserManagementDataContext db = new UserManagementDataContext())
-                {
-
-                    aspnet_User eUser = new aspnet_User();
-                    aspnet_Membership eMembership = new aspnet_Membership();
-
-                    Convert.ToEntity(user, eUser, eMembership);
-                    try
-                    {
-                        db.aspnet_Users.InsertOnSubmit(eUser);
-                        db.aspnet_Memberships.InsertOnSubmit(eMembership);
-                        db.SubmitChanges();
-                    }
-                    catch (Exception ex)
-                    {
-                        return Guid.Empty;
-                    }
-
-                    return user.Id;
-
-
-                }
-
-            }
-            return Guid.Empty;
-        }
-
-        public bool DeleteUser(Guid id)
-        {
-
-            using (UserManagementDataContext db = new UserManagementDataContext())
-            {
-                var user = db.aspnet_Users.Where(x => x.UserId == id).FirstOrDefault();
-                var membership = db.aspnet_Memberships.Where(x => x.UserId == id).FirstOrDefault();
-                var userinroles = db.aspnet_UsersInRoles.Where(x => x.UserId == id).ToList<aspnet_UsersInRole>();
-                try
-                {
-                    db.aspnet_UsersInRoles.DeleteAllOnSubmit(userinroles);
-                    db.aspnet_Memberships.DeleteOnSubmit(membership);
-                    db.aspnet_Users.DeleteOnSubmit(user);
-                    db.SubmitChanges();
-                }
-                catch (Exception ex)
-                {
-                    return false;
-                }
-                return true;
-
-            }
-            return false;
-        }
-
-
-        public bool UpdateUser(User user)
-        {
-            if (user != null)
-            {
-                using (UserManagementDataContext db = new UserManagementDataContext())
-                {
-
-                    var eUser = db.aspnet_Users.Where(x => x.UserId == user.Id).FirstOrDefault();
-                    var eMembership = db.aspnet_Memberships.Where(x => x.UserId == user.Id).FirstOrDefault();
-                    Convert.ToEntity(user, eUser, eMembership);
-                    try
-                    {
-
-                        db.SubmitChanges();
-                    }
-                    catch (Exception ex)
-                    {
-                        return false;
-                    }
-
-                    return true;
-
-                }
-
-            }
-            return false;
-        }
-
-
-        public bool AddUserToRole(Guid roleId, Guid userId) {
-          using (UserManagementDataContext db = new UserManagementDataContext()) {
-            try {
-              aspnet_UsersInRole r = new aspnet_UsersInRole();
-              r.RoleId = roleId;
-              r.UserId = userId;
-              db.aspnet_UsersInRoles.InsertOnSubmit(r);
-              db.SubmitChanges();
-              return true;
-            }
-            catch (Exception ex) {
-              Debug.WriteLine(ex.InnerException);
-              return false;
-            }
-          }
-        }
-
-        public IEnumerable<Guid> GetUsersInRole(Guid roleId) {
-          List<Guid> userList = new List<Guid>();
-          using (UserManagementDataContext db = new UserManagementDataContext()) {
-            try {
-              var users = db.aspnet_UsersInRoles.Where(x => x.RoleId == roleId).ToList<aspnet_UsersInRole>();
-
-              foreach (aspnet_UsersInRole u in users) {
-                userList.Add(GetUser(u.UserId).Id);
-              }
-
-            }
-            catch (Exception ex) {
-              Debug.WriteLine(ex.InnerException);
-              return new List<Guid>();
-
-            }
-
-          }
-
-          return userList;
-        }
-
-      /*
-        public IEnumerable<User> GetUsersInRole(Guid roleId) {
-          List<User> userList = new List<User>();
-          using (UserManagementDataContext db = new UserManagementDataContext()) {
-            try {
-              var users = db.aspnet_UsersInRoles.Where(x => x.RoleId == roleId).ToList<aspnet_UsersInRole>();
-
-              foreach (aspnet_UsersInRole u in users) {
-                userList.Add(GetUser(u.UserId));
-
-              }
-
-            }
-            catch (Exception ex) {
-              Debug.WriteLine(ex.InnerException);
-              return new List<User>();
-            }
-          }
-
-          return userList;
-        }
-       */
-
-        public bool IsUserInRole(Guid userId, Guid roleId) {
-          bool isInRole = false;
-          using (UserManagementDataContext db = new UserManagementDataContext()) {
-            var users = db.aspnet_UsersInRoles.Where(x => x.RoleId == roleId && x.UserId == userId).ToList<aspnet_UsersInRole>();
-            foreach (aspnet_UsersInRole u in users) {
-              isInRole = true;
-            }
-          }
-          return isInRole;
-
-        }
-
-
-        public bool RemoveUserFromRole(Guid roleId, Guid userId) {
-          using (UserManagementDataContext db = new UserManagementDataContext()) {
-            try {
-              var role = db.aspnet_UsersInRoles.Where(x => x.RoleId == roleId && x.UserId == userId).FirstOrDefault();
-
-              db.aspnet_UsersInRoles.DeleteOnSubmit(role);
-              db.SubmitChanges();
-              return true;
-
-            }
-            catch (Exception ex) {
-              Debug.WriteLine(ex.InnerException);
-              return false;
-            }
-          }
-
-        }
-
-
-
-
-        #endregion
-
-
-
-        #region Role
-
-        public Role GetRole(Guid id)
-        {
-            using (UserManagementDataContext db = new UserManagementDataContext())
-            {
-                var role = db.aspnet_Roles.Where(x => x.RoleId == id).FirstOrDefault();
-                return Convert.ToDataTransfer(role);
-            }
-        }
-
-        public IEnumerable<Role> GetAllRoles() {
-          List<DataTransfer.Role> roleList = new List<DataTransfer.Role>();
-          using (UserManagementDataContext db = new UserManagementDataContext()) {
-            var roles = db.aspnet_Roles.ToList<aspnet_Role>();
-            foreach (aspnet_Role role in roles) {
-              roleList.Add(Convert.ToDataTransfer(role));
-            }
-          }
-          return roleList;
-        }
-
-        public IEnumerable<Role> GetRoles(Guid applicationId)
-        {
-            List<DataTransfer.Role> roleList = new List<DataTransfer.Role>();
-            using (UserManagementDataContext db = new UserManagementDataContext())
-            {
-                var roles = db.aspnet_Roles.Where(x => x.ApplicationId == applicationId).ToList<aspnet_Role>();
-
-                foreach (aspnet_Role role in roles)
-                {
-                    roleList.Add(Convert.ToDataTransfer(role));
-                }
-
-            }
-            return roleList;
-        }
-
-        public Guid AddRole(Role role)
-        {
-
-            if (role != null)
-            {
-                using (UserManagementDataContext db = new UserManagementDataContext())
-                {
-
-                    aspnet_Role eRole = new aspnet_Role();
-
-                    Convert.ToEntity(role, eRole);
-                    try
-                    {
-                        db.aspnet_Roles.InsertOnSubmit(eRole);
-                        db.SubmitChanges();
-                    }
-                    catch (Exception ex)
-                    {
-                        return Guid.Empty;
-                    }
-
-                    return role.Id;
-                }
-
-            }
-            return Guid.Empty;
-        }
-
-        public bool DeleteRole(Guid id)
-        {
-            using (UserManagementDataContext db = new UserManagementDataContext())
-            {
-                var role = db.aspnet_Roles.Where(x => x.RoleId == id).FirstOrDefault();
-
-
-                try
-                {
-                    db.aspnet_Roles.DeleteOnSubmit(role);
-                    db.SubmitChanges();
-                }
-                catch (Exception ex)
-                {
-                    return false;
-                }
-                return true;
-
-
-            }
-        }
-
-        public IEnumerable<Guid> GetRolesForUser(Guid userId) {
-          List<Guid> roleList = new List<Guid>();
-          using (UserManagementDataContext db = new UserManagementDataContext()) {
-            try {
-              var roles = db.aspnet_UsersInRoles.Where(x => x.UserId == userId).ToList<aspnet_UsersInRole>();
-              foreach (aspnet_UsersInRole r in roles) {
-                roleList.Add(GetRole(r.RoleId).Id);
-              }
-            }
-            catch (Exception ex) {
-              Debug.WriteLine(ex.InnerException);
-              return new List<Guid>();
-            }
-          }
-
-          return roleList;
-
-        }
-
-       /*
-        public IEnumerable<Role> GetRolesForUser(Guid userId)
-        {
-            List<Role> roleList = new List<Role>();
-            using (UserManagementDataContext db = new UserManagementDataContext())
-            {
-                try
-                {
-                    var roles = db.aspnet_UsersInRoles.Where(x => x.UserId == userId).ToList<aspnet_UsersINRole>();
-
-                    foreach (aspnet_UsersInRole r in roles)
-                    {
-                        roleList.Add(GetRole(r.RoleId));
-
-                    }
-
-                }
-                catch (Exception ex)
-                {
-                    Debug.WriteLine(ex.InnerException);
-                    return new List<Role>();
-                }
-            }
-
-            return roleList;
-        }
-         */
-
-
-
-        public bool UpdateRole(Role role)
-        {
-            if (role != null)
-            {
-                using (UserManagementDataContext db = new UserManagementDataContext())
-                {
-
-                    var eRole = db.aspnet_Roles.Where(x => x.RoleId == role.Id).FirstOrDefault();
-
-                    Convert.ToEntity(role, eRole);
-                    try
-                    {
-
-                        db.SubmitChanges();
-                    }
-                    catch (Exception ex)
-                    {
-                        return false;
-                    }
-
-                    return true;
-
-                }
-
-            }
-            return false;
-        }
-
-
-
-        #endregion
-
-
-
-        #region Application
-
-        public Guid AddApplication(Application application)
-        {
-            if (application != null)
-            {
-                using (UserManagementDataContext db = new UserManagementDataContext())
-                {
-
-                    aspnet_Application eApplication = new aspnet_Application();
-
-                    Convert.ToEntity(application, eApplication);
-                    try
-                    {
-                        db.aspnet_Applications.InsertOnSubmit(eApplication);
-                        db.SubmitChanges();
-                    }
-                    catch (Exception ex)
-                    {
-                        return Guid.Empty;
-                    }
-
-                    return application.Id;
-
-                }
-
-            }
-            return Guid.Empty;
-        }
-
-        public bool UpdateApplication(Application application)
-        {
-            if (application != null)
-            {
-                using (UserManagementDataContext db = new UserManagementDataContext())
-                {
-
-                    var eApplication = db.aspnet_Applications.Where(x => x.ApplicationId == application.Id).FirstOrDefault();
-
-                    Convert.ToEntity(application, eApplication);
-                    try
-                    {
-
-                        db.SubmitChanges();
-                    }
-                    catch (Exception ex)
-                    {
-                        return false;
-                    }
-
-                    return true;
-
-                }
-
-            }
-            return false;
-        }
-
-
-        public bool DeleteApplication(Guid applicationId)
-        {
-            using (UserManagementDataContext db = new UserManagementDataContext())
-            {
-                var users = db.aspnet_Users.Where(x => x.ApplicationId == applicationId).ToList<aspnet_User>();
-                var memberships = db.aspnet_Memberships.Where(x => x.ApplicationId == applicationId).ToList<aspnet_Membership>();
-
-                var roles = db.aspnet_Roles.Where(x => x.ApplicationId == applicationId).ToList<aspnet_Role>();
-                var application = db.aspnet_Applications.Where(x => x.ApplicationId == applicationId).FirstOrDefault();
-
-                try
-                {
-                    foreach (aspnet_User u in users)
-                    {
-                        var userinroles = db.aspnet_UsersInRoles.Where(x => x.UserId == u.UserId).ToList<aspnet_UsersInRole>();
-                        db.aspnet_UsersInRoles.DeleteAllOnSubmit(userinroles);
-                    }
-
-                    db.aspnet_Memberships.DeleteAllOnSubmit(memberships);
-                    db.aspnet_Users.DeleteAllOnSubmit(users);
-                    db.aspnet_Roles.DeleteAllOnSubmit(roles);
-                    db.aspnet_Applications.DeleteOnSubmit(application);
-                    db.SubmitChanges();
-                }
-                catch (Exception ex)
-                {
-                    return false;
-                }
-                return true;
-
-
-            }
-            return false;
-        }
-
-        public Application GetApplication(Guid id)
-        {
-            using (UserManagementDataContext db = new UserManagementDataContext())
-            {
-                var application = db.aspnet_Applications.Where(x => x.ApplicationId == id).FirstOrDefault();
-                return Convert.ToDataTransfer(application);
-            }
-        }
-
-        public IEnumerable<DataTransfer.Application> GetApplications()
-        {
-            List<DataTransfer.Application> applicationList = new List<DataTransfer.Application>();
-            using (UserManagementDataContext db = new UserManagementDataContext())
-            {
-                var apps = db.aspnet_Applications.ToList<aspnet_Application>();
-
-                foreach (aspnet_Application app in apps)
-                {
-                    applicationList.Add(Convert.ToDataTransfer(app));
-                }
-
-            }
-            return applicationList;
-        }
-
-        #endregion
-    }
-
+namespace HeuristicLab.Services.Authentication {
+  [ServiceBehavior(IncludeExceptionDetailInFaults = true)]
+  public class AuthenticationService : IAuthenticationService {
+
+    #region User
+
+    public DataTransfer.User GetUser(Guid id) {
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        var user = db.aspnet_Users.FirstOrDefault(x => x.UserId == id);
+        var membership = db.aspnet_Memberships.Where(x => x.UserId == id).FirstOrDefault();
+        return Convert.ToDto(user, membership);
+      }
+    }
+
+    public IEnumerable<User> GetUsers() {
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        var users = db.aspnet_Users.OrderBy(x => x.UserId).ToList().Zip(db.aspnet_Memberships.OrderBy(x => x.UserId), (x, y) => Convert.ToDto(x, y));
+        return users;
+      }
+    }
+
+
+    public IEnumerable<User> GetUsersForApplication(Guid applicationId) {
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        var users = db.aspnet_Users.Where(x => x.ApplicationId == applicationId).OrderBy(x => x.UserId).ToList().Zip(db.aspnet_Memberships.Where(x => x.ApplicationId == applicationId).OrderBy(x => x.UserId), (x, y) => Convert.ToDto(x, y)).ToArray();
+        return users;
+      }
+    }
+
+
+    public Guid AddUser(User user) {
+      if (user != null) {
+        using (UserManagementDataContext db = new UserManagementDataContext()) {
+          aspnet_User eUser;
+          aspnet_Membership eMembership;
+          user.Id = Guid.NewGuid();
+          Convert.ToEntity(user, out eUser, out  eMembership);
+          db.aspnet_Users.InsertOnSubmit(eUser);
+          db.aspnet_Memberships.InsertOnSubmit(eMembership);
+          db.SubmitChanges();
+          return user.Id;
+        }
+      }
+      return Guid.Empty;
+
+    }
+
+    public void DeleteUser(Guid id) {
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        var user = db.aspnet_Users.Where(x => x.UserId == id).FirstOrDefault();
+        var membership = db.aspnet_Memberships.Where(x => x.UserId == id).FirstOrDefault();
+        var userinroles = db.aspnet_UsersInRoles.Where(x => x.UserId == id).ToList<aspnet_UsersInRole>();
+        db.aspnet_UsersInRoles.DeleteAllOnSubmit(userinroles);
+        db.aspnet_Memberships.DeleteOnSubmit(membership);
+        db.aspnet_Users.DeleteOnSubmit(user);
+        db.SubmitChanges();
+      }
+
+    }
+
+
+    public void UpdateUser(User user) {
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        var eUser = db.aspnet_Users.Where(x => x.UserId == user.Id).FirstOrDefault();
+        var eMembership = db.aspnet_Memberships.Where(x => x.UserId == user.Id).FirstOrDefault();
+        Convert.ToEntity(user, eUser, eMembership);
+        db.SubmitChanges();
+      }
+    }
+
+
+    public void AddUserToRole(Guid roleId, Guid userId) {
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        aspnet_UsersInRole r = new aspnet_UsersInRole();
+        r.RoleId = roleId;
+        r.UserId = userId;
+        db.aspnet_UsersInRoles.InsertOnSubmit(r);
+        db.SubmitChanges();
+      }
+    }
+
+
+
+    public IEnumerable<Guid> GetUsersInRole(Guid roleId) {
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        List<Guid> userList = new List<Guid>();
+        var users = db.aspnet_UsersInRoles.Where(x => x.RoleId == roleId).ToList<aspnet_UsersInRole>();
+        foreach (aspnet_UsersInRole u in users) {
+          userList.Add(GetUser(u.UserId).Id);
+        }
+        return userList;
+      }
+    }
+
+
+    public bool IsUserInRole(Guid userId, Guid roleId) {
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        bool isInRole = false;
+        var users = db.aspnet_UsersInRoles.Where(x => x.RoleId == roleId && x.UserId == userId).ToList<aspnet_UsersInRole>();
+        foreach (aspnet_UsersInRole u in users) {
+          isInRole = true;
+        }
+        return isInRole;
+      }
+    }
+
+
+    public void RemoveUserFromRole(Guid roleId, Guid userId) {
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        var role = db.aspnet_UsersInRoles.Where(x => x.RoleId == roleId && x.UserId == userId).FirstOrDefault();
+        db.aspnet_UsersInRoles.DeleteOnSubmit(role);
+        db.SubmitChanges();
+      }
+    }
+
+
+    // TODO !!!
+    public User ResetPassword(string applicationName, string userName, string password) {
+
+      string salt = "";
+      string answer = "";
+
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        db.aspnet_Membership_ResetPassword(applicationName, userName, password, null, null, salt, null, null, answer);
+        return null;
+      }
+    }
+
+    #endregion
+
+    #region Role
+
+    public Role GetRole(Guid id) {
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        var role = db.aspnet_Roles.Where(x => x.RoleId == id).FirstOrDefault();
+        return Convert.ToDto(role);
+      }
+    }
+
+    public IEnumerable<Role> GetRoles() {
+
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        List<DataTransfer.Role> roleList = new List<DataTransfer.Role>();
+        var roles = db.aspnet_Roles.ToList<aspnet_Role>();
+        foreach (aspnet_Role role in roles) {
+          roleList.Add(Convert.ToDto(role));
+        }
+        return roleList;
+      }
+
+    }
+
+    public IEnumerable<Role> GetRolesForApplication(Guid applicationId) {
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        List<Role> roleList = new List<Role>();
+        var roles = db.aspnet_Roles.Where(x => x.ApplicationId == applicationId).ToList<aspnet_Role>();
+        foreach (aspnet_Role role in roles) {
+          roleList.Add(Convert.ToDto(role));
+        }
+        return roleList;
+      }
+    }
+
+    public Guid AddRole(Role role) {
+      if (role != null) {
+        using (UserManagementDataContext db = new UserManagementDataContext()) {
+          aspnet_Role eRole = new aspnet_Role();
+          role.Id = Guid.NewGuid();
+          Convert.ToEntity(role, eRole);
+          db.aspnet_Roles.InsertOnSubmit(eRole);
+          db.SubmitChanges();
+          return role.Id;
+        }
+      }
+      return Guid.Empty;
+    }
+
+    public void DeleteRole(Guid id) {
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        var role = db.aspnet_Roles.Where(x => x.RoleId == id).FirstOrDefault();
+        var userinroles = db.aspnet_UsersInRoles.Where(x => x.RoleId == id).ToList<aspnet_UsersInRole>();
+        db.aspnet_UsersInRoles.DeleteAllOnSubmit(userinroles);
+        db.aspnet_Roles.DeleteOnSubmit(role);
+        db.SubmitChanges();
+      }
+    }
+
+    public IEnumerable<Guid> GetRolesForUser(Guid userId) {
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        List<Guid> roleList = new List<Guid>();
+        var roles = db.aspnet_UsersInRoles.Where(x => x.UserId == userId).ToList<aspnet_UsersInRole>();
+        foreach (aspnet_UsersInRole r in roles) {
+          roleList.Add(GetRole(r.RoleId).Id);
+        }
+        return roleList;
+      }
+    }
+
+    public void UpdateRole(Role role) {
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        var eRole = db.aspnet_Roles.Where(x => x.RoleId == role.Id).FirstOrDefault();
+        Convert.ToEntity(role, eRole);
+        db.SubmitChanges();
+      }
+    }
+
+    #endregion
+
+    #region Application
+
+    public Guid AddApplication(Application application) {
+      if (application != null) {
+        using (UserManagementDataContext db = new UserManagementDataContext()) {
+          aspnet_Application eApplication = new aspnet_Application();
+          application.Id = Guid.NewGuid();
+          Convert.ToEntity(application, eApplication);
+          db.aspnet_Applications.InsertOnSubmit(eApplication);
+          db.SubmitChanges();
+          return application.Id;
+        }
+      }
+      return Guid.Empty;
+    }
+
+    public void UpdateApplication(Application application) {
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        var eApplication = db.aspnet_Applications.Where(x => x.ApplicationId == application.Id).FirstOrDefault();
+        Convert.ToEntity(application, eApplication);
+        db.SubmitChanges();
+      }
+    }
+
+
+    public void DeleteApplication(Guid applicationId) {
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        var users = db.aspnet_Users.Where(x => x.ApplicationId == applicationId).ToList<aspnet_User>();
+        var memberships = db.aspnet_Memberships.Where(x => x.ApplicationId == applicationId).ToList<aspnet_Membership>();
+        var roles = db.aspnet_Roles.Where(x => x.ApplicationId == applicationId).ToList<aspnet_Role>();
+        var application = db.aspnet_Applications.Where(x => x.ApplicationId == applicationId).FirstOrDefault();
+        foreach (aspnet_User u in users) {
+          var userinroles = db.aspnet_UsersInRoles.Where(x => x.UserId == u.UserId).ToList<aspnet_UsersInRole>();
+          db.aspnet_UsersInRoles.DeleteAllOnSubmit(userinroles);
+        }
+        db.aspnet_Memberships.DeleteAllOnSubmit(memberships);
+        db.aspnet_Users.DeleteAllOnSubmit(users);
+        db.aspnet_Roles.DeleteAllOnSubmit(roles);
+        db.aspnet_Applications.DeleteOnSubmit(application);
+        db.SubmitChanges();
+      }
+    }
+
+    public Application GetApplication(Guid id) {
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        var application = db.aspnet_Applications.Where(x => x.ApplicationId == id).FirstOrDefault();
+        return Convert.ToDto(application);
+      }
+    }
+
+    public IEnumerable<Application> GetApplications() {
+      List<Application> applicationList = new List<Application>();
+      using (UserManagementDataContext db = new UserManagementDataContext()) {
+        var apps = db.aspnet_Applications.ToList<aspnet_Application>();
+        foreach (aspnet_Application app in apps) {
+          applicationList.Add(Convert.ToDto(app));
+        }
+      }
+      return applicationList;
+    }
+    #endregion
+  }
 }
-

branches/UserManagement/HeuristicLab.Services.Authentication/Convert.cs

@@ -1 @@
-using HeuristicLab.Services.Authentication.DataAccess;
+#region License Information
+/* HeuristicLab 
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * 
+ * This file is part of HeuristicLab. 
+ * 
+ * HeuristicLab is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * HeuristicLab is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 
+ */
+#endregion
+using HeuristicLab.Services.Authentication.DataAccess;
 using HeuristicLab.Services.Authentication.DataTransfer;
 
-namespace HeuristicLab.Services.Authentication
-{
-    public class Convert
-    {
+namespace HeuristicLab.Services.Authentication {
+  public class Convert {
 
-        #region User
+    #region User
 
-        /// <summary>
-        /// converts data access object to data transfer object
-        /// </summary>
-        /// <param name="source">data access object</param>
-        /// <returns>data transfer object</returns>
-        public static User ToDataTransfer(aspnet_User userSource, aspnet_Membership membershipSource)
-        {
-            if (userSource == null || membershipSource == null) return null;
-            return new User()
-            {
-                ApplicationId = userSource.ApplicationId,
-                Id = userSource.UserId,
-                Name = userSource.UserName,
-                //LoweredUserName = userSource.LoweredUserName,
-                //IsAnonymous = userSource.IsAnonymous,
-                LastActivityDate = userSource.LastActivityDate,
-                Password = membershipSource.Password,
-                PasswordSalt = membershipSource.PasswordSalt,
-                Email = membershipSource.Email,
-                IsApproved = membershipSource.IsApproved,
-                IsLookedOut = membershipSource.IsApproved,
-                CreateDate = membershipSource.CreateDate,
-                LastLoginDate = membershipSource.LastLoginDate,
-                LastPasswordChangeDate = membershipSource.LastPasswordChangedDate,
-                LastLockoutDate = membershipSource.LastLockoutDate,
-                Comment = membershipSource.Comment
-            };
-        }
+    public static User ToDto(aspnet_User sourceUser, aspnet_Membership sourceMembership) {
+      if (sourceUser == null || sourceMembership == null) return null;
+      return new User() {
+        ApplicationId = sourceUser.ApplicationId,
+        Id = sourceUser.UserId,
+        Name = sourceUser.UserName,
+        LastActivityDate = sourceUser.LastActivityDate,
+        Email = sourceMembership.Email,
+        IsApproved = sourceMembership.IsApproved,
+        IsLookedOut = sourceMembership.IsApproved,
+        CreateDate = sourceMembership.CreateDate,
+        LastLoginDate = sourceMembership.LastLoginDate,
+        LastPasswordChangeDate = sourceMembership.LastPasswordChangedDate,
+        LastLockoutDate = sourceMembership.LastLockoutDate,
+        Description = sourceMembership.Comment
+      };
+    }
 
-        /// <summary>
-        /// converts data transfer object to data access object
-        /// </summary>
-        /// <param name="source">data transfer object</param>
-        /// <param name="target">data access object</param>
-        public static void ToEntity(User source, aspnet_User userTarget, aspnet_Membership membershipTarget)
-        {
-            if ((source != null) && (userTarget != null) && (membershipTarget != null))
-            {
-                userTarget.ApplicationId = source.ApplicationId;
-                membershipTarget.ApplicationId = source.ApplicationId;
-                userTarget.UserId = source.Id;
-                membershipTarget.UserId = source.Id;
-                userTarget.UserName = source.Name;
-                userTarget.LoweredUserName = source.Name;
-                userTarget.IsAnonymous = false;
-                userTarget.LastActivityDate = source.LastActivityDate;
-                membershipTarget.Password = source.Password;
-                membershipTarget.PasswordFormat = 1;
-                membershipTarget.PasswordSalt = source.PasswordSalt;
-                membershipTarget.Email = source.Email;
-                membershipTarget.IsApproved = source.IsApproved;
-                membershipTarget.IsLockedOut = source.IsLookedOut;
-                membershipTarget.CreateDate = source.CreateDate;
-                membershipTarget.LastLoginDate = source.LastLoginDate;
-                membershipTarget.LastPasswordChangedDate = source.LastPasswordChangeDate;
-                membershipTarget.LastLockoutDate = source.LastLockoutDate;
-                membershipTarget.FailedPasswordAttemptCount = 0;
-                membershipTarget.FailedPasswordAttemptWindowStart = new System.DateTime(1900, 01, 01);
-                membershipTarget.FailedPasswordAnswerAttemptCount = 0;
-                membershipTarget.FailedPasswordAnswerAttemptWindowStart = new System.DateTime(1900, 01, 01);
-                membershipTarget.Comment = source.Comment;
+    public static void ToEntity(User sourceUser, aspnet_User targetUser, aspnet_Membership targetMembership) {
+      if ((sourceUser != null) && (targetUser != null) && (targetMembership != null)) {
+        targetUser.ApplicationId = sourceUser.ApplicationId;
+        targetUser.UserId = sourceUser.Id;
+        targetUser.UserName = sourceUser.Name;
+        targetUser.LoweredUserName = sourceUser.Name;
+        targetUser.IsAnonymous = false;
+        targetUser.LastActivityDate = sourceUser.LastActivityDate;
+        targetMembership.UserId = sourceUser.Id;
+        targetMembership.ApplicationId = sourceUser.ApplicationId;
+        targetMembership.PasswordFormat = 1;
+        targetMembership.Email = sourceUser.Email;
+        targetMembership.IsApproved = sourceUser.IsApproved;
+        targetMembership.IsLockedOut = sourceUser.IsLookedOut;
+        targetMembership.CreateDate = sourceUser.CreateDate;
+        targetMembership.LastLoginDate = sourceUser.LastLoginDate;
+        targetMembership.LastPasswordChangedDate = sourceUser.LastPasswordChangeDate;
+        targetMembership.LastLockoutDate = sourceUser.LastLockoutDate;
+        targetMembership.FailedPasswordAttemptCount = 0;
+        targetMembership.FailedPasswordAttemptWindowStart = new System.DateTime(1900, 01, 01);
+        targetMembership.FailedPasswordAnswerAttemptCount = 0;
+        targetMembership.FailedPasswordAnswerAttemptWindowStart = new System.DateTime(1900, 01, 01);
+        targetMembership.Comment = sourceUser.Description;
+      }
+    }
 
-            }
+    public static void ToEntity(User source, out aspnet_User userTarget, out aspnet_Membership membershipTarget) {
+      userTarget = new aspnet_User();
+      membershipTarget = new aspnet_Membership();
 
-        }
+      if ((source != null)) {
+        userTarget.ApplicationId = source.ApplicationId;
+        userTarget.UserId = source.Id;
+        userTarget.UserName = source.Name;
+        userTarget.LoweredUserName = source.Name;
+        userTarget.IsAnonymous = false;
+        userTarget.LastActivityDate = source.LastActivityDate;
+        membershipTarget.UserId = source.Id;
+        membershipTarget.ApplicationId = source.ApplicationId;
+        membershipTarget.PasswordFormat = 1;
+        membershipTarget.Email = source.Email;
+        membershipTarget.IsApproved = source.IsApproved;
+        membershipTarget.IsLockedOut = source.IsLookedOut;
+        membershipTarget.CreateDate = source.CreateDate;
+        membershipTarget.LastLoginDate = source.LastLoginDate;
+        membershipTarget.LastPasswordChangedDate = source.LastPasswordChangeDate;
+        membershipTarget.LastLockoutDate = source.LastLockoutDate;
+        membershipTarget.FailedPasswordAttemptCount = 0;
+        membershipTarget.FailedPasswordAttemptWindowStart = new System.DateTime(1900, 01, 01);
+        membershipTarget.FailedPasswordAnswerAttemptCount = 0;
+        membershipTarget.FailedPasswordAnswerAttemptWindowStart = new System.DateTime(1900, 01, 01);
+        membershipTarget.Comment = source.Description;
+      }
+    }
 
+    #endregion
 
-        #endregion
+    #region Application
 
-        #region Application
+    public static Application ToDto(aspnet_Application sourceApplication) {
+      if (sourceApplication == null) return null;
+      return new Application() {
+        Id = sourceApplication.ApplicationId,
+        Name = sourceApplication.ApplicationName,
+        Description = sourceApplication.Description
+      };
+    }
 
-        /// <summary>
-        /// converts data access object to data transfer object
-        /// </summary>
-        /// <param name="source">data access object</param>
-        /// <returns>data transfer object</returns>
-        public static Application ToDataTransfer(aspnet_Application source)
-        {
-            if (source == null) return null;
-            return new Application()
-            {
-                Id = source.ApplicationId,
-                Name = source.ApplicationName,
-                //LoweredApplicationName = source.LoweredApplicationName,
-                Description = source.Description
-            };
-        }
+    public static void ToEntity(Application sourceApplication, aspnet_Application targetApplication) {
+      if ((sourceApplication != null) && (targetApplication != null)) {
+        targetApplication.ApplicationId = sourceApplication.Id;
+        targetApplication.ApplicationName = sourceApplication.Name;
+        targetApplication.LoweredApplicationName = sourceApplication.Name.ToLower();
+        targetApplication.Description = sourceApplication.Description;
+      }
+    }
 
-        /// <summary>
-        /// converts data transfer object to data access object
-        /// </summary>
-        /// <param name="source">data transfer object</param>
-        /// <param name="target">data access object</param>
-        public static void ToEntity(Application source, aspnet_Application target)
-        {
-            if ((source != null) && (target != null))
-            {
-                target.ApplicationId = source.Id;
-                target.ApplicationName = source.Name;
-                target.LoweredApplicationName = source.Name.ToLower();
-                target.Description = source.Description;
-            }
+    public static aspnet_Application ToEntity(Application sourceApplication) {
+      if (sourceApplication == null) return null;
+      return new aspnet_Application() {
+        ApplicationId = sourceApplication.Id,
+        ApplicationName = sourceApplication.Name,
+        LoweredApplicationName = sourceApplication.Name.ToLower(),
+        Description = sourceApplication.Description
+      };
+    }
 
-        }
+    #endregion
 
-        #endregion
+    #region Role
 
-        #region Role
+    public static Role ToDto(aspnet_Role sourceRole) {
+      if (sourceRole == null) return null;
+      return new Role() {
+        ApplicationId = sourceRole.ApplicationId,
+        Id = sourceRole.RoleId,
+        Name = sourceRole.RoleName,
+        Description = sourceRole.Description,
+      };
+    }
 
-        /// <summary>
-        /// converts data access object to data transfer object
-        /// </summary>
-        /// <param name="source">data access object</param>
-        /// <returns>data transfer object</returns>
-        public static Role ToDataTransfer(aspnet_Role source)
-        {
-            if (source == null) return null;
-            return new Role()
-            {
-                ApplicationId = source.ApplicationId,
-                Id = source.RoleId,
-                Name = source.RoleName,
-                Description = source.Description,
-                //LoweredRoleName = source.LoweredRoleName,
-            };
-        }
+    public static void ToEntity(Role sourceRole, aspnet_Role targetRole) {
+      if ((sourceRole != null) && (targetRole != null)) {
+        targetRole.ApplicationId = sourceRole.ApplicationId;
+        targetRole.RoleId = sourceRole.Id;
+        targetRole.RoleName = sourceRole.Name;
+        targetRole.LoweredRoleName = sourceRole.Name.ToLower();
+        targetRole.Description = sourceRole.Description;
+      }
+    }
 
-        /// <summary>
-        /// converts data transfer object to data access object
-        /// </summary>
-        /// <param name="source">data transfer object</param>
-        /// <param name="target">data access object</param>
-        public static void ToEntity(Role source, aspnet_Role target)
-        {
-            if ((source != null) && (target != null))
-            {
-                target.ApplicationId = source.ApplicationId;
-                target.RoleId = source.Id;
-                target.RoleName = source.Name;
-                target.LoweredRoleName = source.Name.ToLower();
-                target.Description = source.Description;
-            }
+    public static aspnet_Role ToEntity(Role sourceRole) {
+      if (sourceRole == null) return null;
+      return new aspnet_Role() {
+        ApplicationId = sourceRole.ApplicationId,
+        RoleId = sourceRole.Id,
+        RoleName = sourceRole.Name,
+        LoweredRoleName = sourceRole.Name.ToLower(),
+        Description = sourceRole.Description,
+      };
+    }
 
-        }
-
-        #endregion
-
-    }
+    #endregion
+  }
 }

branches/UserManagement/HeuristicLab.Services.Authentication/Interfaces/IAuthenticationService.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab 
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * 
+ * This file is part of HeuristicLab. 
+ * 
+ * HeuristicLab is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * HeuristicLab is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 
+ */
+#endregion
+using System;
 using System.Collections.Generic;
 using HeuristicLab.Services.Authentication.DataTransfer;
@@ -5 +25 @@
 using System.Net.Security;
 
-namespace HeuristicLab.Services.Authentication
-{
-    [ServiceContract(ProtectionLevel = ProtectionLevel.EncryptAndSign)]
-    public interface IAuthenticationService
-    {
-        #region User
+namespace HeuristicLab.Services.Authentication {
+  [ServiceContract(ProtectionLevel = ProtectionLevel.EncryptAndSign)]
+  public interface IAuthenticationService {
 
-        [OperationContract]
-        User GetUser(Guid id);
+    #region User
 
-        [OperationContract]
-        IEnumerable<User> GetAllUsers();
+    [OperationContract]
+    User GetUser(Guid id);
 
-        [OperationContract]
-        IEnumerable<User> GetUsers(Guid applicationId);
+    [OperationContract()]
+    IEnumerable<User> GetUsers();
 
-        [OperationContract]
-        Guid AddUser(User user);       
+    [OperationContract()]
+    IEnumerable<User> GetUsersForApplication(Guid applicationId);
 
-        [OperationContract]
-        bool DeleteUser(Guid id);
+    [OperationContract]
+    Guid AddUser(User user);
 
-        [OperationContract]
-        bool UpdateUser(User user);
+    [OperationContract]
+    void DeleteUser(Guid id);
 
-        [OperationContract]
-        bool AddUserToRole(Guid roleId, Guid userId);
+    [OperationContract]
+    void UpdateUser(User user);
 
-        [OperationContract]
-        IEnumerable<Guid> GetUsersInRole(Guid roleId);
+    [OperationContract]
+    void AddUserToRole(Guid roleId, Guid userId);
 
-        //[OperationContract]
-        //IEnumerable<User> GetUsersInRole(Guid roleId); // return = Guid
+    [OperationContract]
+    IEnumerable<Guid> GetUsersInRole(Guid roleId);
 
-        [OperationContract]
-        bool RemoveUserFromRole(Guid roleId, Guid userId);
+    [OperationContract]
+    void RemoveUserFromRole(Guid roleId, Guid userId);
 
-        [OperationContract]
-        bool IsUserInRole(Guid userId, Guid roleId);
+    [OperationContract]
+    bool IsUserInRole(Guid userId, Guid roleId);
 
-        #endregion
+    [OperationContract]
+    User ResetPassword(string applicationName, string userName, string password);
 
-        #region Role
+    #endregion
 
-        [OperationContract]
-        Role GetRole(Guid id);
+    #region Role
 
-        [OperationContract]
-        IEnumerable<Role> GetAllRoles();
+    [OperationContract]
+    Role GetRole(Guid id);
 
-        [OperationContract]
-        IEnumerable<Role> GetRoles(Guid applicationId);
+    [OperationContract()]
+    IEnumerable<Role> GetRoles();
 
-        [OperationContract]
-        Guid AddRole(Role role); 
+    [OperationContract()]
+    IEnumerable<Role> GetRolesForApplication(Guid applicationId);
 
-        [OperationContract]
-        bool UpdateRole(Role role);
+    [OperationContract]
+    Guid AddRole(Role role);
 
-        [OperationContract]
-        bool DeleteRole(Guid id);
+    [OperationContract]
+    void UpdateRole(Role role);
 
+    [OperationContract]
+    void DeleteRole(Guid id);
 
-        [OperationContract]
-        IEnumerable<Guid> GetRolesForUser(Guid userId);
+    [OperationContract]
+    IEnumerable<Guid> GetRolesForUser(Guid userId);
 
+    #endregion
 
-        //[OperationContract]
-        //IEnumerable<Role> GetRolesForUser(Guid userId);  // returnvalue = GUID
+    #region Application
 
-        #endregion
+    [OperationContract]
+    Application GetApplication(Guid id);
 
-        #region Application
+    [OperationContract]
+    Guid AddApplication(Application application);
 
-        [OperationContract]
-        Application GetApplication(Guid id);
+    [OperationContract]
+    void DeleteApplication(Guid id);
 
-        [OperationContract]
-        Guid AddApplication(Application application); // ADD
+    [OperationContract]
+    IEnumerable<Application> GetApplications();
 
-        [OperationContract]
-        bool DeleteApplication(Guid id);
+    [OperationContract]
+    void UpdateApplication(Application application);
 
-        [OperationContract]
-        IEnumerable<DataTransfer.Application> GetApplications();
-
-
-        [OperationContract]
-        bool UpdateApplication(Application application);
-
-        #endregion
-
-        
-    }
+    #endregion
+  }
 }