Changeset 4731
- Timestamp:
- 11/06/10 14:22:03 (14 years ago)
- Location:
- branches/ClientManagement/HeuristicLab.Services.Authentication
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ClientManagement/HeuristicLab.Services.Authentication/HLDemo/HeuristicLab.Services.DemoService/HeuristicLab.Services.DemoService.csproj
r4728 r4731 81 81 <Folder Include="App_Data\" /> 82 82 </ItemGroup> 83 <ItemGroup>84 <ProjectReference Include="..\..\HeuristicLab.Services.Authentication.AdminMethods\HeuristicLab.Services.Authentication.AdminMethods.csproj">85 <Project>{2DC20235-6A91-4ABC-8E3E-660B43EAD23B}</Project>86 <Name>HeuristicLab.Services.Authentication.AdminMethods</Name>87 </ProjectReference>88 </ItemGroup>89 83 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 90 84 <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" /> -
branches/ClientManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.DataAccess/ClientManagment.dbml
r4730 r4731 2 2 <Table Name="" Member="Resources"> 3 3 <Type Name="Resource" InheritanceCode="Resource" IsInheritanceDefault="true"> 4 <Column Name="ResourceID" Member=" ResourceId" Storage="_ResourceID" AutoSync="OnInsert" Type="System.Guid" IsPrimaryKey="true" CanBeNull="false" />4 <Column Name="ResourceID" Member="Id" Storage="_ResourceID" AutoSync="OnInsert" Type="System.Guid" IsPrimaryKey="true" CanBeNull="false" /> 5 5 <Column Name="Name" Type="System.String" CanBeNull="false" /> 6 6 <Column Name="Description" Type="System.String" CanBeNull="true" /> 7 7 <Column Name="ResourceType" Type="System.Guid" CanBeNull="false" IsDiscriminator="true" /> 8 <Association Name="Resource_ResourceResourceGroup" Member="Clients" Storage="_ResourceResourceGroups" ThisKey=" ResourceId" OtherKey="ResourceId" Type="ResourceResourceGroup" />9 <Association Name="Resource_ResourceResourceGroup1" Member="ResourceGroups" Storage="_ResourceResourceGroups1" ThisKey=" ResourceId" OtherKey="ResourceGroupId" Type="ResourceResourceGroup" />8 <Association Name="Resource_ResourceResourceGroup" Member="Clients" Storage="_ResourceResourceGroups" ThisKey="Id" OtherKey="ResourceId" Type="ResourceResourceGroup" /> 9 <Association Name="Resource_ResourceResourceGroup1" Member="ResourceGroups" Storage="_ResourceResourceGroups1" ThisKey="Id" OtherKey="ResourceGroupId" Type="ResourceResourceGroup" /> 10 10 <Type Name="Client" InheritanceCode="Client"> 11 11 <Column Name="ProcessorType" Type="System.String" CanBeNull="true" /> … … 23 23 <Column Name="ResourceID" Member="ResourceId" Storage="_ResourceID" Type="System.Guid" IsPrimaryKey="true" CanBeNull="false" /> 24 24 <Column Name="ResourceGroupID" Member="ResourceGroupId" Storage="_ResourceGroupID" Type="System.Guid" IsPrimaryKey="true" CanBeNull="false" /> 25 <Association Name="Resource_ResourceResourceGroup" Member="Client" Storage="_Resource" ThisKey="ResourceId" OtherKey=" ResourceId" Type="Resource" IsForeignKey="true" />26 <Association Name="Resource_ResourceResourceGroup1" Member="ResourceGroup" Storage="_Resource1" ThisKey="ResourceGroupId" OtherKey=" ResourceId" Type="Resource" IsForeignKey="true" />25 <Association Name="Resource_ResourceResourceGroup" Member="Client" Storage="_Resource" ThisKey="ResourceId" OtherKey="Id" Type="Resource" IsForeignKey="true" /> 26 <Association Name="Resource_ResourceResourceGroup1" Member="ResourceGroup" Storage="_Resource1" ThisKey="ResourceGroupId" OtherKey="Id" Type="Resource" IsForeignKey="true" /> 27 27 </Type> 28 28 </Table> -
branches/ClientManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.DataAccess/ClientManagment.dbml.layout
r4694 r4731 3 3 <DataContextMoniker Name="/ClientManagmentDataContext" /> 4 4 <nestedChildShapes> 5 <classShape Id="cace4a80-c7a9-4132-9b82-c4ef3884dbc0" absoluteBounds="0.75, 3.875, 2, 1. 7535424804687496">5 <classShape Id="cace4a80-c7a9-4132-9b82-c4ef3884dbc0" absoluteBounds="0.75, 3.875, 2, 1.9631982421874996"> 6 6 <DataClassMoniker Name="/ClientManagmentDataContext/Client" /> 7 7 <nestedChildShapes> 8 <elementListCompartment Id="bce42ce5-f605-4c26-a210-ed4ea2812ca7" absoluteBounds="0.765, 4.335, 1.9700000000000002, 1. 19354248046875" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />8 <elementListCompartment Id="bce42ce5-f605-4c26-a210-ed4ea2812ca7" absoluteBounds="0.765, 4.335, 1.9700000000000002, 1.4031982421875" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" /> 9 9 </nestedChildShapes> 10 10 </classShape> 11 <classShape Id="ea129a98-d63f-4c3a-a3e8-dff64ad53c30" absoluteBounds="2.125, 1.25, 2, 1. 424847819010417">11 <classShape Id="ea129a98-d63f-4c3a-a3e8-dff64ad53c30" absoluteBounds="2.125, 1.25, 2, 1.5785953776041666"> 12 12 <DataClassMoniker Name="/ClientManagmentDataContext/Resource" /> 13 13 <nestedChildShapes> 14 <elementListCompartment Id="3a656a72-fe83-45a4-87c2-c0aa13fa068f" absoluteBounds="2.14, 1.71, 1.9700000000000002, 0.86484781901041663" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />14 <elementListCompartment Id="3a656a72-fe83-45a4-87c2-c0aa13fa068f" absoluteBounds="2.14, 1.71, 1.9700000000000002, 1.0185953776041665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" /> 15 15 </nestedChildShapes> 16 16 </classShape> … … 21 21 </nodes> 22 22 </inheritanceConnector> 23 <classShape Id="7820d3d1-da69-4786-9415-4fa77e5fc03a" absoluteBounds="3.625, 3.875, 2, 0. 76745849609374961">23 <classShape Id="7820d3d1-da69-4786-9415-4fa77e5fc03a" absoluteBounds="3.625, 3.875, 2, 0.80938964843749961"> 24 24 <DataClassMoniker Name="/ClientManagmentDataContext/ResourceGroup" /> 25 25 <nestedChildShapes> 26 <elementListCompartment Id="125f9904-768c-4c01-9a04-5212a9e6e484" absoluteBounds="3.64, 4.335, 1.9700000000000002, 0.2 0745849609375" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />26 <elementListCompartment Id="125f9904-768c-4c01-9a04-5212a9e6e484" absoluteBounds="3.64, 4.335, 1.9700000000000002, 0.2493896484375" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" /> 27 27 </nestedChildShapes> 28 28 </classShape> … … 33 33 </nodes> 34 34 </inheritanceConnector> 35 <classShape Id="9b206f4e-128f-4c3f-bd08-7f2d271ebb2b" absoluteBounds="5.125, 1.25, 2, 1. 0961531575520831">35 <classShape Id="9b206f4e-128f-4c3f-bd08-7f2d271ebb2b" absoluteBounds="5.125, 1.25, 2, 1.1939925130208331"> 36 36 <DataClassMoniker Name="/ClientManagmentDataContext/ResourceResourceGroup" /> 37 37 <nestedChildShapes> 38 <elementListCompartment Id="9d879183-e5e2-42e9-9fbf-3e68f959d459" absoluteBounds="5.14, 1.71, 1.9700000000000002, 0. 53615315755208326" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />38 <elementListCompartment Id="9d879183-e5e2-42e9-9fbf-3e68f959d459" absoluteBounds="5.14, 1.71, 1.9700000000000002, 0.63399251302083326" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" /> 39 39 </nestedChildShapes> 40 40 </classShape> -
branches/ClientManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.DataTransfer/Client.cs
r4694 r4731 1 2 using System.Runtime.Serialization; 1 using System.Runtime.Serialization; 3 2 4 namespace HeuristicLab.Services.Authentication.DataTransfer { 3 namespace HeuristicLab.Services.Authentication.DataTransfer 4 { 5 [DataContract] 6 public class Client : HeuristicLab.Services.Authentication.DataTransfer.Resource 7 { 8 [DataMember] 9 public string ProcessorType { get; set; } 10 [DataMember] 11 public string NumberOfProcessors { get; set; } 12 [DataMember] 13 public string NumberOfThreads { get; set; } 14 [DataMember] 15 public string IPAdress { get; set; } 16 [DataMember] 17 public string MemorySize { get; set; } 18 [DataMember] 19 public string OperatingSystem { get; set; } 5 20 6 public class Client : HeuristicLab.Services.Authentication.DataTransfer.Resource { 7 8 public string ProcessorType { get; set; } 9 10 public string NumberOfProcessors { get; set; } 11 12 public string NumberOfThreads { get; set; } 13 14 public string IPAdress { get; set; } 15 16 public string MemorySize { get; set; } 17 18 public string OperatingSystem { get; set; } 19 20 } 21 } 21 22 } -
branches/ClientManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.DataTransfer/HeuristicLab.Services.Authentication.DataTransfer.csproj
r4728 r4731 42 42 <Reference Include="System.Core" /> 43 43 <Reference Include="System.Data.Linq" /> 44 <Reference Include="System.Runtime.Serialization" /> 44 45 <Reference Include="System.Xml.Linq" /> 45 46 <Reference Include="System.Data.DataSetExtensions" /> -
branches/ClientManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.DataTransfer/Resource.cs
r4694 r4731 1 // Resource.cs1 using System.Runtime.Serialization; 2 2 3 using System.Runtime.Serialization; 4 5 namespace HeuristicLab.Services.Authentication.DataTransfer { 6 public abstract class Resource { 7 8 public System.Guid ResourceID { get; set; } 9 10 public string Name { get; set; } 11 12 public string Description { get; set; } 13 14 public string ResourceType { get; set; } 15 16 public string ResourceGroup { get; set; } 17 18 public override string ToString() { 19 return (this.Name + "; Id= " + this.ResourceID + "; " + this.ResourceType); 3 namespace HeuristicLab.Services.Authentication.DataTransfer 4 { 5 [DataContract] 6 public abstract class Resource 7 { 8 [DataMember] 9 public System.Guid ResourceID { get; set; } 10 [DataMember] 11 public string Name { get; set; } 12 [DataMember] 13 public string Description { get; set; } 14 [DataMember] 15 public string ResourceType { get; set; } 16 [DataMember] 17 public string ResourceGroup { get; set; } 20 18 } 21 }22 19 } 23 20 -
branches/ClientManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.DataTransfer/ResourceGroup.cs
r4592 r4731 1 2 using System.Runtime.Serialization; 1 using System.Runtime.Serialization; 3 2 4 namespace HeuristicLab.Services.Authentication.DataTransfer { 5 public class ResourceGroup : Resource { 6 } 3 namespace HeuristicLab.Services.Authentication.DataTransfer 4 { 5 [DataContract] 6 public class ResourceGroup : Resource 7 { 8 } 7 9 } 8 10 -
branches/ClientManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.csproj
r4728 r4731 64 64 </ItemGroup> 65 65 <ItemGroup> 66 <Content Include=" Service1.svc" />66 <Content Include="AuthenticationService.svc" /> 67 67 <Content Include="Web.config" /> 68 68 <Content Include="Web.Debug.config"> … … 75 75 <ItemGroup> 76 76 <Compile Include="Convert.cs" /> 77 <Compile Include=" Service1.svc.cs">78 <DependentUpon> Service1.svc</DependentUpon>77 <Compile Include="AuthenticationService.svc.cs"> 78 <DependentUpon>AuthenticationService.svc</DependentUpon> 79 79 </Compile> 80 <Compile Include="I Service1.cs" />80 <Compile Include="Interfaces\IAuthenticationService.cs" /> 81 81 <Compile Include="Properties\AssemblyInfo.cs" /> 82 82 </ItemGroup> -
branches/ClientManagement/HeuristicLab.Services.Authentication/UserInterface/HeuristicLab.Services.Authentication.UserInterface.csproj
r4695 r4731 83 83 <WCFMetadata Include="Service References\" /> 84 84 </ItemGroup> 85 <ItemGroup>86 <ProjectReference Include="..\HeuristicLab.Services.Authentication.AdminMethods\HeuristicLab.Services.Authentication.AdminMethods.csproj">87 <Project>{2DC20235-6A91-4ABC-8E3E-660B43EAD23B}</Project>88 <Name>HeuristicLab.Services.Authentication.AdminMethods</Name>89 </ProjectReference>90 </ItemGroup>91 85 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 92 86 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset
for help on using the changeset viewer.