Changeset 4732


Ignore:
Timestamp:
11/06/10 14:28:39 (9 years ago)
Author:
jhaider
Message:

#1197
Updated project

Location:
branches/ClientManagement/HeuristicLab.Services.Authentication
Files:
3 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • branches/ClientManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.DataAccess/ClientManagment.dbml

    r4731 r4732  
    11<?xml version="1.0" encoding="utf-8"?><Database Class="ClientManagmentDataContext" xmlns="http://schemas.microsoft.com/linqtosql/dbml/2007">
    22  <Table Name="" Member="Resources">
    3     <Type Name="Resource" InheritanceCode="Resource" IsInheritanceDefault="true">
     3    <Type Name="Resource" InheritanceCode="Resource">
    44      <Column Name="ResourceID" Member="Id" Storage="_ResourceID" AutoSync="OnInsert" Type="System.Guid" IsPrimaryKey="true" CanBeNull="false" />
    55      <Column Name="Name" Type="System.String" CanBeNull="false" />
    66      <Column Name="Description" Type="System.String" CanBeNull="true" />
    7       <Column Name="ResourceType" Type="System.Guid" CanBeNull="false" IsDiscriminator="true" />
     7      <Column Name="ResourceType" Type="System.String" CanBeNull="false" IsDiscriminator="true" />
    88      <Association Name="Resource_ResourceResourceGroup" Member="Clients" Storage="_ResourceResourceGroups" ThisKey="Id" OtherKey="ResourceId" Type="ResourceResourceGroup" />
    99      <Association Name="Resource_ResourceResourceGroup1" Member="ResourceGroups" Storage="_ResourceResourceGroups1" ThisKey="Id" OtherKey="ResourceGroupId" Type="ResourceResourceGroup" />
     
    1616        <Column Name="OperatingSystem" Type="System.String" CanBeNull="true" />
    1717      </Type>
    18       <Type Name="ResourceGroup" InheritanceCode="ResourceGroup" />
     18      <Type Name="ResourceGroup" InheritanceCode="ResourceGroup" IsInheritanceDefault="true" />
    1919    </Type>
    2020  </Table>
  • branches/ClientManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.DataAccess/ClientManagment.designer.cs

    r4694 r4732  
    3737    partial void DeleteResourceResourceGroup(ResourceResourceGroup instance);
    3838    #endregion
    39 
    40 
    41     public ClientManagmentDataContext() :
    42       base(global::HeuristicLab.Services.Authentication.DataAccess.Properties.Settings.Default.ClientManagementConnectionString, mappingSource) {
    43       OnCreated();
    44     }
    45 
     39   
    4640    public ClientManagmentDataContext(string connection) :
    4741        base(connection, mappingSource)
     
    8680 
    8781  [global::System.Data.Linq.Mapping.TableAttribute(Name="")]
    88   [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="Resource", Type=typeof(Resource), IsDefault=true)]
     82  [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="Resource", Type=typeof(Resource))]
    8983  [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="Client", Type=typeof(Client))]
    90   [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="ResourceGroup", Type=typeof(ResourceGroup))]
     84  [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="ResourceGroup", Type=typeof(ResourceGroup), IsDefault=true)]
    9185  public partial class Resource : INotifyPropertyChanging, INotifyPropertyChanged
    9286  {
     
    110104    partial void OnValidate(System.Data.Linq.ChangeAction action);
    111105    partial void OnCreated();
    112     partial void OnResourceIDChanging(System.Guid value);
    113     partial void OnResourceIDChanged();
     106    partial void OnIdChanging(System.Guid value);
     107    partial void OnIdChanged();
    114108    partial void OnNameChanging(string value);
    115109    partial void OnNameChanged();
     
    127121    }
    128122   
    129     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResourceID", AutoSync=AutoSync.OnInsert, IsPrimaryKey=true)]
    130     public System.Guid ResourceID
     123    [global::System.Data.Linq.Mapping.ColumnAttribute(Name="ResourceID", Storage="_ResourceID", AutoSync=AutoSync.OnInsert, IsPrimaryKey=true)]
     124    public System.Guid Id
    131125    {
    132126      get
     
    138132        if ((this._ResourceID != value))
    139133        {
    140           this.OnResourceIDChanging(value);
     134          this.OnIdChanging(value);
    141135          this.SendPropertyChanging();
    142136          this._ResourceID = value;
    143           this.SendPropertyChanged("ResourceID");
    144           this.OnResourceIDChanged();
     137          this.SendPropertyChanged("Id");
     138          this.OnIdChanged();
    145139        }
    146140      }
     
    207201    }
    208202   
    209     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ResourceResourceGroup", Storage="_ResourceResourceGroups", ThisKey="ResourceID", OtherKey="ResourceID")]
     203    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ResourceResourceGroup", Storage="_ResourceResourceGroups", ThisKey="Id", OtherKey="ResourceId")]
    210204    public EntitySet<ResourceResourceGroup> Clients
    211205    {
     
    220214    }
    221215   
    222     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ResourceResourceGroup1", Storage="_ResourceResourceGroups1", ThisKey="ResourceID", OtherKey="ResourceGroupID")]
     216    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ResourceResourceGroup1", Storage="_ResourceResourceGroups1", ThisKey="Id", OtherKey="ResourceGroupId")]
    223217    public EntitySet<ResourceResourceGroup> ResourceGroups
    224218    {
     
    470464    partial void OnValidate(System.Data.Linq.ChangeAction action);
    471465    partial void OnCreated();
    472     partial void OnResourceIDChanging(System.Guid value);
    473     partial void OnResourceIDChanged();
    474     partial void OnResourceGroupIDChanging(System.Guid value);
    475     partial void OnResourceGroupIDChanged();
     466    partial void OnResourceIdChanging(System.Guid value);
     467    partial void OnResourceIdChanged();
     468    partial void OnResourceGroupIdChanging(System.Guid value);
     469    partial void OnResourceGroupIdChanged();
    476470    #endregion
    477471   
     
    483477    }
    484478   
    485     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResourceID", IsPrimaryKey=true)]
    486     public System.Guid ResourceID
     479    [global::System.Data.Linq.Mapping.ColumnAttribute(Name="ResourceID", Storage="_ResourceID", IsPrimaryKey=true)]
     480    public System.Guid ResourceId
    487481    {
    488482      get
     
    494488        if ((this._ResourceID != value))
    495489        {
    496           if (this._Resource.HasLoadedOrAssignedValue)
    497           {
    498             throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
    499           }
    500           this.OnResourceIDChanging(value);
     490          this.OnResourceIdChanging(value);
    501491          this.SendPropertyChanging();
    502492          this._ResourceID = value;
    503           this.SendPropertyChanged("ResourceID");
    504           this.OnResourceIDChanged();
    505         }
    506       }
    507     }
    508    
    509     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResourceGroupID", IsPrimaryKey=true)]
    510     public System.Guid ResourceGroupID
     493          this.SendPropertyChanged("ResourceId");
     494          this.OnResourceIdChanged();
     495        }
     496      }
     497    }
     498   
     499    [global::System.Data.Linq.Mapping.ColumnAttribute(Name="ResourceGroupID", Storage="_ResourceGroupID", IsPrimaryKey=true)]
     500    public System.Guid ResourceGroupId
    511501    {
    512502      get
     
    518508        if ((this._ResourceGroupID != value))
    519509        {
    520           if (this._Resource1.HasLoadedOrAssignedValue)
    521           {
    522             throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
    523           }
    524           this.OnResourceGroupIDChanging(value);
     510          this.OnResourceGroupIdChanging(value);
    525511          this.SendPropertyChanging();
    526512          this._ResourceGroupID = value;
    527           this.SendPropertyChanged("ResourceGroupID");
    528           this.OnResourceGroupIDChanged();
    529         }
    530       }
    531     }
    532    
    533     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ResourceResourceGroup", Storage="_Resource", ThisKey="ResourceID", OtherKey="ResourceID", IsForeignKey=true)]
     513          this.SendPropertyChanged("ResourceGroupId");
     514          this.OnResourceGroupIdChanged();
     515        }
     516      }
     517    }
     518   
     519    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ResourceResourceGroup", Storage="_Resource", ThisKey="ResourceId", OtherKey="Id", IsForeignKey=true)]
    534520    public Resource Client
    535521    {
     
    554540          {
    555541            value.Clients.Add(this);
    556             this._ResourceID = value.ResourceID;
     542            this._ResourceID = value.Id;
    557543          }
    558544          else
     
    565551    }
    566552   
    567     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ResourceResourceGroup1", Storage="_Resource1", ThisKey="ResourceGroupID", OtherKey="ResourceID", IsForeignKey=true)]
     553    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ResourceResourceGroup1", Storage="_Resource1", ThisKey="ResourceGroupId", OtherKey="Id", IsForeignKey=true)]
    568554    public Resource ResourceGroup
    569555    {
     
    588574          {
    589575            value.ResourceGroups.Add(this);
    590             this._ResourceGroupID = value.ResourceID;
     576            this._ResourceGroupID = value.Id;
    591577          }
    592578          else
  • branches/ClientManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.sln

    r4694 r4732  
    99EndProject
    1010Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{D83C93B5-5DDE-4A66-A9B8-D7FD0A891ABB}"
    11 EndProject
    12 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Authentication.AdminMethods", "HeuristicLab.Services.Authentication.AdminMethods\HeuristicLab.Services.Authentication.AdminMethods.csproj", "{2DC20235-6A91-4ABC-8E3E-660B43EAD23B}"
    13 EndProject
    14 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Authentication.UserInterface", "UserInterface\HeuristicLab.Services.Authentication.UserInterface.csproj", "{345CD2B9-F5A9-498C-A50C-79D41E449351}"
    15 EndProject
    16 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DemoClient", "HLDemo\HeuristicLab.DemoClient\HeuristicLab.DemoClient.csproj", "{92119B2A-37FA-444B-8C68-61114BD041F4}"
    17 EndProject
    18 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.DemoService", "HLDemo\HeuristicLab.Services.DemoService\HeuristicLab.Services.DemoService.csproj", "{C1A05138-12F5-4B47-B32D-80A508D3073A}"
    1911EndProject
    2012Global
     
    6860    {D83C93B5-5DDE-4A66-A9B8-D7FD0A891ABB}.Release|x86.ActiveCfg = Release|x86
    6961    {D83C93B5-5DDE-4A66-A9B8-D7FD0A891ABB}.Release|x86.Build.0 = Release|x86
    70     {2DC20235-6A91-4ABC-8E3E-660B43EAD23B}.Debug|Any CPU.ActiveCfg = Debug|x86
    71     {2DC20235-6A91-4ABC-8E3E-660B43EAD23B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    72     {2DC20235-6A91-4ABC-8E3E-660B43EAD23B}.Debug|Mixed Platforms.Build.0 = Debug|x86
    73     {2DC20235-6A91-4ABC-8E3E-660B43EAD23B}.Debug|x86.ActiveCfg = Debug|x86
    74     {2DC20235-6A91-4ABC-8E3E-660B43EAD23B}.Debug|x86.Build.0 = Debug|x86
    75     {2DC20235-6A91-4ABC-8E3E-660B43EAD23B}.Release|Any CPU.ActiveCfg = Release|x86
    76     {2DC20235-6A91-4ABC-8E3E-660B43EAD23B}.Release|Mixed Platforms.ActiveCfg = Release|x86
    77     {2DC20235-6A91-4ABC-8E3E-660B43EAD23B}.Release|Mixed Platforms.Build.0 = Release|x86
    78     {2DC20235-6A91-4ABC-8E3E-660B43EAD23B}.Release|x86.ActiveCfg = Release|x86
    79     {2DC20235-6A91-4ABC-8E3E-660B43EAD23B}.Release|x86.Build.0 = Release|x86
    80     {345CD2B9-F5A9-498C-A50C-79D41E449351}.Debug|Any CPU.ActiveCfg = Debug|x86
    81     {345CD2B9-F5A9-498C-A50C-79D41E449351}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    82     {345CD2B9-F5A9-498C-A50C-79D41E449351}.Debug|Mixed Platforms.Build.0 = Debug|x86
    83     {345CD2B9-F5A9-498C-A50C-79D41E449351}.Debug|x86.ActiveCfg = Debug|x86
    84     {345CD2B9-F5A9-498C-A50C-79D41E449351}.Debug|x86.Build.0 = Debug|x86
    85     {345CD2B9-F5A9-498C-A50C-79D41E449351}.Release|Any CPU.ActiveCfg = Release|x86
    86     {345CD2B9-F5A9-498C-A50C-79D41E449351}.Release|Mixed Platforms.ActiveCfg = Release|x86
    87     {345CD2B9-F5A9-498C-A50C-79D41E449351}.Release|Mixed Platforms.Build.0 = Release|x86
    88     {345CD2B9-F5A9-498C-A50C-79D41E449351}.Release|x86.ActiveCfg = Release|x86
    89     {345CD2B9-F5A9-498C-A50C-79D41E449351}.Release|x86.Build.0 = Release|x86
    90     {92119B2A-37FA-444B-8C68-61114BD041F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    91     {92119B2A-37FA-444B-8C68-61114BD041F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
    92     {92119B2A-37FA-444B-8C68-61114BD041F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
    93     {92119B2A-37FA-444B-8C68-61114BD041F4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
    94     {92119B2A-37FA-444B-8C68-61114BD041F4}.Debug|x86.ActiveCfg = Debug|x86
    95     {92119B2A-37FA-444B-8C68-61114BD041F4}.Debug|x86.Build.0 = Debug|x86
    96     {92119B2A-37FA-444B-8C68-61114BD041F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
    97     {92119B2A-37FA-444B-8C68-61114BD041F4}.Release|Any CPU.Build.0 = Release|Any CPU
    98     {92119B2A-37FA-444B-8C68-61114BD041F4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
    99     {92119B2A-37FA-444B-8C68-61114BD041F4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
    100     {92119B2A-37FA-444B-8C68-61114BD041F4}.Release|x86.ActiveCfg = Release|x86
    101     {92119B2A-37FA-444B-8C68-61114BD041F4}.Release|x86.Build.0 = Release|x86
    102     {C1A05138-12F5-4B47-B32D-80A508D3073A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    103     {C1A05138-12F5-4B47-B32D-80A508D3073A}.Debug|Any CPU.Build.0 = Debug|Any CPU
    104     {C1A05138-12F5-4B47-B32D-80A508D3073A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
    105     {C1A05138-12F5-4B47-B32D-80A508D3073A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
    106     {C1A05138-12F5-4B47-B32D-80A508D3073A}.Debug|x86.ActiveCfg = Debug|Any CPU
    107     {C1A05138-12F5-4B47-B32D-80A508D3073A}.Release|Any CPU.ActiveCfg = Release|Any CPU
    108     {C1A05138-12F5-4B47-B32D-80A508D3073A}.Release|Any CPU.Build.0 = Release|Any CPU
    109     {C1A05138-12F5-4B47-B32D-80A508D3073A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
    110     {C1A05138-12F5-4B47-B32D-80A508D3073A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
    111     {C1A05138-12F5-4B47-B32D-80A508D3073A}.Release|x86.ActiveCfg = Release|Any CPU
    11262  EndGlobalSection
    11363  GlobalSection(SolutionProperties) = preSolution
  • branches/ClientManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication/Convert.cs

    r4694 r4732  
    3131      if (source == null) return null;
    3232      return new DT.Client {
    33         ResourceID = source.ResourceID,
     33        ResourceID = source.Id,
    3434        Name = source.Name,
    3535        Description = source.Description,
     
    4747      if (source == null) return null;
    4848      return new DA.Client {
    49         ResourceID = source.ResourceID,
     49        Id = source.ResourceID,
    5050        Name = source.Name,
    5151        Description = source.Description,
     
    6262    public static void ToEntity(DT.Client source, DA.Client target) {
    6363      if ((source != null) && (target != null)) {
    64         target.ResourceID = source.ResourceID;
     64        target.Id = source.ResourceID;
    6565        target.Name = source.Name;
    6666        target.Description = source.Description;
     
    8181      if (source == null) return null;
    8282      return new DT.ResourceGroup {
    83         ResourceID = source.ResourceID,
     83        ResourceID = source.Id,
    8484        Name = source.Name,
    8585        Description = source.Description,
     
    9191      if (source == null) return null;
    9292      return new DA.ResourceGroup {
    93         ResourceID = source.ResourceID,
     93        Id = source.ResourceID,
    9494        Name = source.Name,
    9595        Description = source.Description,
     
    100100    public static void ToEntity(DT.ResourceGroup source, DA.ResourceGroup target) {
    101101      if ((source != null) && (target != null)) {
    102         target.ResourceID = source.ResourceID;
     102        target.Id = source.ResourceID;
    103103        target.Name = source.Name;
    104104        target.Description = source.Description;
  • branches/ClientManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.csproj

    r4731 r4732  
    6464  </ItemGroup>
    6565  <ItemGroup>
    66     <Content Include="AuthenticationService.svc" />
     66    <Content Include="ClientService.svc" />
    6767    <Content Include="Web.config" />
    6868    <Content Include="Web.Debug.config">
     
    7575  <ItemGroup>
    7676    <Compile Include="Convert.cs" />
    77     <Compile Include="AuthenticationService.svc.cs">
    78       <DependentUpon>AuthenticationService.svc</DependentUpon>
     77    <Compile Include="ClientService.svc.cs">
     78      <DependentUpon>ClientService.svc</DependentUpon>
    7979    </Compile>
    80     <Compile Include="Interfaces\IAuthenticationService.cs" />
     80    <Compile Include="Interfaces\IClientService.cs" />
    8181    <Compile Include="Properties\AssemblyInfo.cs" />
    8282  </ItemGroup>
  • branches/ClientManagement/HeuristicLab.Services.Authentication/Test/Program.cs

    r4694 r4732  
    2626            Client c = new Client();
    2727
    28             c.ResourceID = Guid.NewGuid();
     28            c.Id = Guid.NewGuid();
    2929            c.Name = "Eagle-Eye";
    3030            c.Description = "Development-PC";
Note: See TracChangeset for help on using the changeset viewer.