Changeset 7355 for branches

Timestamp:

01/18/12 10:36:46 (13 years ago)

Author:

ascheibe

Message:

#1648

• added a role verifier for checking if the current user has a certain role
• updated year in license headers and frame files

Location:

branches/ClientUserManagement

Files:

• HeuristicLab.Clients.Access/3.3/Properties/AssemblyInfo.frame (modified) (2 diffs)
• HeuristicLab.GeoIP/1.12/GeoIPLookupService.cs (modified) (1 diff)
• HeuristicLab.GeoIP/1.12/Properties/AssemblyInfo.frame (modified) (2 diffs)
• HeuristicLab.Services.Access-3.3.Tests/MockUserManager.cs (modified) (1 diff)
• HeuristicLab.Services.Access-3.3.Tests/UnitTest.cs (modified) (1 diff)
• HeuristicLab.Services.Access.DataAccess/3.3/Properties/AssemblyInfo.frame (modified) (2 diffs)
• HeuristicLab.Services.Access/3.3 (modified) (1 prop)
• HeuristicLab.Services.Access/3.3/AccessService.cs (modified) (2 diffs)
• HeuristicLab.Services.Access/3.3/Convert.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/DataTransfer/AccessItem.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/DataTransfer/Client.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/DataTransfer/ClientConfiguration.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/DataTransfer/ClientError.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/DataTransfer/ClientGroup.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/DataTransfer/ClientGroupMapping.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/DataTransfer/ClientLog.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/DataTransfer/ClientType.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/DataTransfer/Country.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/DataTransfer/OperatingSystem.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/DataTransfer/Plugin.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/DataTransfer/Resource.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/DataTransfer/Role.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/DataTransfer/User.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/DataTransfer/UserGroup.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/DataTransfer/UserGroupBase.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/DataTransfer/UserGroupMapping.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/HeuristicLab.Services.Access-3.3.csproj (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/IAccessService.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/Interfaces/IRoleVerifier.cs (added)
• HeuristicLab.Services.Access/3.3/Interfaces/IUserManager.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/Properties/AssemblyInfo.frame (modified) (2 diffs)
• HeuristicLab.Services.Access/3.3/RoleVerifier.cs (added)
• HeuristicLab.Services.Access/3.3/UserManager.cs (modified) (1 diff)

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/Properties/AssemblyInfo.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

branches/ClientUserManagement/HeuristicLab.GeoIP/1.12/GeoIPLookupService.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.GeoIP/1.12/Properties/AssemblyInfo.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

branches/ClientUserManagement/HeuristicLab.Services.Access-3.3.Tests/MockUserManager.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access-3.3.Tests/UnitTest.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access.DataAccess/3.3/Properties/AssemblyInfo.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3

@@ -3 +3 @@
 obj
 HeuristicLab.Services.Access-3.3.csproj.user
+HeuristicLab.Services.Access-3.3.sln.docstates.suo

@@ -3 +3 @@
 obj
 HeuristicLab.Services.Access-3.3.csproj.user
+HeuristicLab.Services.Access-3.3.sln.docstates.suo

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/AccessService.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -41 +41 @@
     }
 
+    private IRoleVerifier roleVerifier;
+    private IRoleVerifier RoleVerifier {
+      get {
+        if (roleVerifier == null) roleVerifier = new RoleVerifier();
+        return roleVerifier;
+      }
+    }
+
     #region Client Members
     public bool ClientExists(Guid id) {

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/Convert.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/AccessItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/Client.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/ClientConfiguration.cs

@@ -2 +2 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/ClientError.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/ClientGroup.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/ClientGroupMapping.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/ClientLog.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/ClientType.cs

@@ -2 +2 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/Country.cs

@@ -2 +2 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/OperatingSystem.cs

@@ -2 +2 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/Plugin.cs

@@ -2 +2 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/Resource.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/Role.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab 
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
  * 
  * This file is part of HeuristicLab. 

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/User.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab 
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
  * 
  * This file is part of HeuristicLab. 

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/UserGroup.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab 
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 
  * 
  * This file is part of HeuristicLab. 

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/UserGroupBase.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/UserGroupMapping.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/HeuristicLab.Services.Access-3.3.csproj

@@ -73 +73 @@
     <Compile Include="DataTransfer\UserGroupMapping.cs" />
     <Compile Include="IAccessService.cs" />
+    <Compile Include="Interfaces\IRoleVerifier.cs" />
     <Compile Include="Interfaces\IUserManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="AccessService.cs" />
+    <Compile Include="RoleVerifier.cs" />
     <Compile Include="UserManager.cs" />
   </ItemGroup>

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/IAccessService.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/Interfaces/IUserManager.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/Properties/AssemblyInfo.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/UserManager.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

@@ -3 +3 @@
 obj
 HeuristicLab.Services.Access-3.3.csproj.user
+HeuristicLab.Services.Access-3.3.sln.docstates.suo