Renamed the ipad-read-service aggregation service to ipad-read-service-v1

SVN: 27203

openbis-ipad/BisKit/Classes/CISDOBIpadService.h

@@ -52,8 +52,8 @@ enum CISOBIpadServiceErrorCode {
 //! Log the user into the openBIS instance
 - (CISDOBAsyncCall *)loginUser:(NSString *)user password:(NSString *)password;
 
-//! Get all entities from the openBIS ipad service. The success message will be invoked with a collection of CISDOBIpadRawEntity objects.
-- (CISDOBAsyncCall *)listAllEntities;
+//! Get all root-level entities from the openBIS ipad service. The success message will be invoked with a collection of CISDOBIpadRawEntity objects.
+- (CISDOBAsyncCall *)listRootLevelEntities;
 
 @end
 

openbis-ipad/BisKit/Classes/CISDOBIpadService.m

@@ -77,7 +77,7 @@ NSString *const CISDOBIpadServiceErrorDomain = @"CISDOBIpadServiceErrorDomain";
 - (void)rememberIpadService:(NSArray *)services notifying:(CISDOBIpadServiceCall *)iPadCall
 {    
     for (NSDictionary *service in services) {
-        if ([@"ipad-read-service" isEqualToString: [service objectForKey: @"serviceKey"]]) {
+        if ([@"ipad-read-service-v1" isEqualToString: [service objectForKey: @"serviceKey"]]) {
             _ipadReadService = service;
             break;
         }
@@ -141,7 +141,7 @@ NSString *const CISDOBIpadServiceErrorDomain = @"CISDOBIpadServiceErrorDomain";
     return iPadCall;
 }
 
-- (CISDOBAsyncCall *)listAllEntities;
+- (CISDOBAsyncCall *)listRootLevelEntities;
 {
     CISDOBAsyncCall *connectionCall = [_connection
         createReportFromDataStore: [_ipadReadService objectForKey: @"dataStoreCode"]

openbis-ipad/BisKit/Tests/CISDOBIpadEntityTest.m

@@ -137,7 +137,7 @@ NSManagedObjectContext* GetDatabaseManagedObjectContext(NSURL* storeURL, NSError
     call = [_service loginUser: GetDefaultUserName() password: GetDefaultUserPassword()];
     [self configureAndRunCallSynchronously: call];
     
-    call = [_service listAllEntities];
+    call = [_service listRootLevelEntities];
     [self configureAndRunCallSynchronously: call];
     
     STAssertNotNil(_callResult, @"The iPad service should have returned some entities.");

openbis-ipad/BisKit/Tests/CISDOBIpadServiceTest.m

@@ -58,7 +58,7 @@
     call = [_service loginUser: GetDefaultUserName() password: GetDefaultUserPassword()];
     [self configureAndRunCallSynchronously: call];
     
-    call = [_service listAllEntities];
+    call = [_service listRootLevelEntities];
     [self configureAndRunCallSynchronously: call];
     
     STAssertNotNil(_callResult, @"The iPad service should have returned some entities.");

openbis-ipad/BisKit/Tests/CISDOBLiveConnectionTest.m

@@ -52,7 +52,7 @@
 - (NSDictionary *)extractIpadService:(NSArray *)services
 {
     for (NSDictionary *service in services) {
-        if ([@"ipad-read-service" isEqualToString: [service objectForKey: @"serviceKey"]]) {
+        if ([@"ipad-read-service-v1" isEqualToString: [service objectForKey: @"serviceKey"]]) {
             return service;
         }
     }
@@ -80,7 +80,7 @@
     [self configureAndRunCallSynchronously: call];
     STAssertNotNil(_callResult, @"There should be some aggregation services on the server");
     NSDictionary *service = [self extractIpadService: _callResult];    
-    STAssertNotNil(service, @"There should be a service with key \"ipad-read-service\". Services: %@", _callResult);
+    STAssertNotNil(service, @"There should be a service with key \"ipad-read-service-v1\". Services: %@", _callResult);
     
     call =
         [_connection
@@ -88,9 +88,9 @@
             aggregationService: [service objectForKey: @"serviceKey"]
             parameters: nil];
     [self configureAndRunCallSynchronously: call];
-    STAssertNotNil(_callResult, @"The ipad-read-service should have returned some data.");
+    STAssertNotNil(_callResult, @"The ipad-read-service-v1 should have returned some data.");
     NSArray *rows = [_callResult objectForKey: @"rows"];
-    STAssertTrue([rows count] > 0, @"The ipad-read-service should have returned some data.");
+    STAssertTrue([rows count] > 0, @"The ipad-read-service-v1 should have returned some data.");
     for (NSArray* row in rows)
         [self assertServiceDataRowIsParsable: row];
 }

openbis-ipad/Research/BisMac.xcodeproj/project.pbxproj

@@ -230,9 +230,9 @@
 				3649C8A915EBB2950019AC55 /* CISDOBConnection.m */,
 				3680B1321611B5CE008BA207 /* CISDOBIpadService.h */,
 				3680B1331611B5CE008BA207 /* CISDOBIpadService.m */,
-				36F71E4A1619829300C87277 /* persistent-data-model.xcdatamodeld */,
 				36F71E4D1619834600C87277 /* CISDOBIpadEntity.h */,
 				36F71E4E1619834600C87277 /* CISDOBIpadEntity.m */,
+				36F71E4A1619829300C87277 /* persistent-data-model.xcdatamodeld */,
 			);
 			path = Classes;
 			sourceTree = "<group>";

openbis-ipad/openBIS/openBIS.xcodeproj/project.pbxproj

@@ -270,17 +270,17 @@
 		36F71ECA161C453D00C87277 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				36F71ED5161C453D00C87277 /* CISDOBShared.h */,
 				36F71ECB161C453D00C87277 /* CISDOBAsyncCall.h */,
 				36F71ECC161C453D00C87277 /* CISDOBAsyncCall.m */,
 				36F71ECD161C453D00C87277 /* CISDOBConnection.h */,
 				36F71ECE161C453D00C87277 /* CISDOBConnection.m */,
-				36F71ECF161C453D00C87277 /* CISDOBIpadEntity.h */,
-				36F71ED0161C453D00C87277 /* CISDOBIpadEntity.m */,
 				36F71ED1161C453D00C87277 /* CISDOBIpadService.h */,
 				36F71ED2161C453D00C87277 /* CISDOBIpadService.m */,
 				36F71ED3161C453D00C87277 /* CISDOBJsonRpcCall.h */,
 				36F71ED4161C453D00C87277 /* CISDOBJsonRpcCall.m */,
-				36F71ED5161C453D00C87277 /* CISDOBShared.h */,
+				36F71ECF161C453D00C87277 /* CISDOBIpadEntity.h */,
+				36F71ED0161C453D00C87277 /* CISDOBIpadEntity.m */,
 				36F71ED6161C453D00C87277 /* persistent-data-model.xcdatamodeld */,
 			);
 			path = Classes;