Changeset 7916 for trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients

Timestamp:

05/29/12 14:04:59 (13 years ago)

Author:

jkarder

Message:

#1860:

• integrated owner attribute (OwnerUserId) into the Hive components
• adjusted database scheme
• adjusted service methods

Location:

trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients

Files:

• HiveServiceClient.cs (modified) (8 diffs)
• ResourcePermission.cs (added)

trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveServiceClient.cs

@@ -2 +2 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.544
+//     Runtime Version:4.0.30319.269
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -19 +19 @@
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.StateLog))]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Task))]
+  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.ResourcePermission))]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Downtime))]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.JobPermission))]
@@ -59 +60 @@
 
     public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-
-
   }
 
@@ -416 +415 @@
           this.PriorityField = value;
           this.RaisePropertyChanged("Priority");
+        }
+      }
+    }
+  }
+
+  [System.Diagnostics.DebuggerStepThroughAttribute()]
+  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
+  [System.Runtime.Serialization.DataContractAttribute(Name = "ResourcePermission", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
+  [System.SerializableAttribute()]
+  public partial class ResourcePermission : HeuristicLab.Clients.Hive.HiveItem {
+
+    [System.Runtime.Serialization.OptionalFieldAttribute()]
+    private System.Guid GrantedByUserIdField;
+
+    [System.Runtime.Serialization.OptionalFieldAttribute()]
+    private System.Guid GrantedUserIdField;
+
+    [System.Runtime.Serialization.OptionalFieldAttribute()]
+    private System.Guid ResourceIdField;
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public System.Guid GrantedByUserId {
+      get {
+        return this.GrantedByUserIdField;
+      }
+      set {
+        if ((this.GrantedByUserIdField.Equals(value) != true)) {
+          this.GrantedByUserIdField = value;
+          this.RaisePropertyChanged("GrantedByUserId");
+        }
+      }
+    }
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public System.Guid GrantedUserId {
+      get {
+        return this.GrantedUserIdField;
+      }
+      set {
+        if ((this.GrantedUserIdField.Equals(value) != true)) {
+          this.GrantedUserIdField = value;
+          this.RaisePropertyChanged("GrantedUserId");
+        }
+      }
+    }
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public System.Guid ResourceId {
+      get {
+        return this.ResourceIdField;
+      }
+      set {
+        if ((this.ResourceIdField.Equals(value) != true)) {
+          this.ResourceIdField = value;
+          this.RaisePropertyChanged("ResourceId");
         }
       }
@@ -912 +966 @@
 
     [System.Runtime.Serialization.OptionalFieldAttribute()]
+    private System.Nullable<System.Guid> OwnerUserIdField;
+
+    [System.Runtime.Serialization.OptionalFieldAttribute()]
     private System.Nullable<System.Guid> ParentResourceIdField;
 
@@ -923 +980 @@
           this.HbIntervalField = value;
           this.RaisePropertyChanged("HbInterval");
+        }
+      }
+    }
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public System.Nullable<System.Guid> OwnerUserId {
+      get {
+        return this.OwnerUserIdField;
+      }
+      set {
+        if ((this.OwnerUserIdField.Equals(value) != true)) {
+          this.OwnerUserIdField = value;
+          this.RaisePropertyChanged("OwnerUserId");
         }
       }
@@ -1621 +1691 @@
     int GetNewHeartbeatInterval(System.Guid slaveId);
 
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GrantResourcePermission", ReplyAction = "http://tempuri.org/IHiveService/GrantResourcePermissionResponse")]
+    void GrantResourcePermission(System.Guid slaveId, System.Guid grantedUserId);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/RevokeResourcePermission", ReplyAction = "http://tempuri.org/IHiveService/RevokeResourcePermissionResponse")]
+    void RevokeResourcePermission(System.Guid slaveId, System.Guid grantedUserId);
+
+    [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetSlavePermissions", ReplyAction = "http://tempuri.org/IHiveService/GetSlavePermissionsResponse")]
+    System.Collections.Generic.List<HeuristicLab.Clients.Hive.ResourcePermission> GetSlavePermissions(System.Guid slaveId);
+
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/AddDowntime", ReplyAction = "http://tempuri.org/IHiveService/AddDowntimeResponse")]
     System.Guid AddDowntime(HeuristicLab.Clients.Hive.Downtime downtime);
@@ -1830 +1909 @@
     }
 
+    public void GrantResourcePermission(System.Guid slaveId, System.Guid grantedUserId) {
+      base.Channel.GrantResourcePermission(slaveId, grantedUserId);
+    }
+
+    public void RevokeResourcePermission(System.Guid slaveId, System.Guid grantedUserId) {
+      base.Channel.RevokeResourcePermission(slaveId, grantedUserId);
+    }
+
+    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.ResourcePermission> GetSlavePermissions(System.Guid slaveId) {
+      return base.Channel.GetSlavePermissions(slaveId);
+    }
+
     public System.Guid AddDowntime(HeuristicLab.Clients.Hive.Downtime downtime) {
       return base.Channel.AddDowntime(downtime);