Changeset 1825

Timestamp:

05/15/09 13:26:07 (16 years ago)

Author:

msteinbi

Message:

changed signature of addClientGroup method (#599)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/3.2/Interfaces/IClientManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.2/ClientManager.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/3.2/ServerConsoleFacade.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Contracts/3.2/Interfaces/IClientManager.cs

@@ -43 +43 @@
     ResponseObject<List<ClientGroup>> GetAllGroupsOfResource(Guid resourceId);
     [OperationContract]
-    Response AddClientGroup(ClientGroup clientGroup);
+    ResponseObject<ClientGroup> AddClientGroup(ClientGroup clientGroup);
     [OperationContract]
     Response DeleteClientGroup(Guid clientGroupId);
     [OperationContract]
+    [ServiceKnownType(typeof(Resource))]
+    [ServiceKnownType(typeof(ClientInfo))]
+    [ServiceKnownType(typeof(ClientGroup))]
     Response AddResourceToGroup(Guid clientGroupId, Resource resource);
     [OperationContract]

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientManager.cs

@@ -117 +117 @@
     /// <param name="clientGroup"></param>
     /// <returns></returns>
-    public Response AddClientGroup(ClientGroup clientGroup) {
-      ISession session = factory.GetSessionForCurrentThread();
-
-      try {
-        IClientGroupAdapter clientGroupAdapter =
-          session.GetDataAdapter<ClientGroup, IClientGroupAdapter>();
-
-        Response response = new Response();
+    public ResponseObject<ClientGroup> AddClientGroup(ClientGroup clientGroup) {
+      ISession session = factory.GetSessionForCurrentThread();
+
+      try {
+        IClientGroupAdapter clientGroupAdapter =
+          session.GetDataAdapter<ClientGroup, IClientGroupAdapter>();
+
+        ResponseObject<ClientGroup> response = new ResponseObject<ClientGroup>();
 
         if (clientGroup.Id != Guid.Empty) {
@@ -131 +131 @@
         } else {
           clientGroupAdapter.Update(clientGroup);
+          response.Obj = clientGroup;
           response.Success = true;
           response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_ADDED;

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ServerConsoleFacade.cs

@@ -84 +84 @@
     }
 
-    public Response AddClientGroup(ClientGroup clientGroup) {
+    public ResponseObject<ClientGroup> AddClientGroup(ClientGroup clientGroup) {
       if (HasPermission(PermissiveSecurityAction.Add_ClientGroup))
         return clientManager.AddClientGroup(clientGroup);