Modified: chemistry/objectivecmis/branches/browser-binding/ObjectiveCMIS/Bindings/Browser/CMISBrowserUtil.m URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/browser-binding/ObjectiveCMIS/Bindings/Browser/CMISBrowserUtil.m?rev=1591879&r1=1591878&r2=1591879&view=diff ============================================================================== --- chemistry/objectivecmis/branches/browser-binding/ObjectiveCMIS/Bindings/Browser/CMISBrowserUtil.m (original) +++ chemistry/objectivecmis/branches/browser-binding/ObjectiveCMIS/Bindings/Browser/CMISBrowserUtil.m Fri May 2 11:56:49 2014 @@ -210,7 +210,7 @@ return typeDef; } -+ (void)objectDataFromJSONData:(NSData *)jsonData typeCache:(CMISTypeCache *)typeCache completionBlock:(void(^)(CMISObjectData *objectData, NSError *error))completionBlock ++ (void)objectDataFromJSONData:(NSData *)jsonData typeCache:(CMISBrowserTypeCache *)typeCache completionBlock:(void(^)(CMISObjectData *objectData, NSError *error))completionBlock { // TODO: error handling i.e. if jsonData is nil, also handle outError being nil @@ -228,7 +228,7 @@ } } -+ (void)objectListFromJSONData:(NSData *)jsonData typeCache:(CMISTypeCache *)typeCache isQueryResult:(BOOL)isQueryResult completionBlock:(void(^)(CMISObjectList *objectList, NSError *error))completionBlock ++ (void)objectListFromJSONData:(NSData *)jsonData typeCache:(CMISBrowserTypeCache *)typeCache isQueryResult:(BOOL)isQueryResult completionBlock:(void(^)(CMISObjectList *objectList, NSError *error))completionBlock { // TODO: error handling i.e. if jsonData is nil, also handle outError being nil @@ -327,7 +327,7 @@ } } -+ (void)objectParents:(NSData *)jsonData typeCache:(CMISTypeCache *)typeCache completionBlock:(void(^)(NSArray *objectParents, NSError *error))completionBlock ++ (void)objectParents:(NSData *)jsonData typeCache:(CMISBrowserTypeCache *)typeCache completionBlock:(void(^)(NSArray *objectParents, NSError *error))completionBlock { // TODO: error handling i.e. if jsonData is nil, also handle outError being nil @@ -346,7 +346,7 @@ #pragma mark - #pragma mark Private helper methods -+ (void)convertObject:(NSDictionary *)dictionary typeCache:(CMISTypeCache *)typeCache completionBlock:(void(^)(CMISObjectData *objectData, NSError *error))completionBlock ++ (void)convertObject:(NSDictionary *)dictionary typeCache:(CMISBrowserTypeCache *)typeCache completionBlock:(void(^)(CMISObjectData *objectData, NSError *error))completionBlock { if (!dictionary) { completionBlock(nil, nil); @@ -431,7 +431,7 @@ } -+ (void)convertObjects:(NSArray *)objectsArray position:(NSInteger)position convertedObjects:(NSMutableArray *)convertedObjects typeCache:(CMISTypeCache *)typeCache completionBlock:(void(^)(NSArray* objects, NSError *error))completionBlock ++ (void)convertObjects:(NSArray *)objectsArray position:(NSInteger)position convertedObjects:(NSMutableArray *)convertedObjects typeCache:(CMISBrowserTypeCache *)typeCache completionBlock:(void(^)(NSArray* objects, NSError *error))completionBlock { NSDictionary *dictionary = [objectsArray objectAtIndex:position]; NSDictionary *objectDictionary = [dictionary cmis_objectForKeyNotNull:kCMISBrowserJSONObject]; @@ -472,7 +472,7 @@ } -+ (void)convertObjects:(NSArray *)objectsArray typeCache:(CMISTypeCache *)typeCache completionBlock:(void(^)(NSArray* objects, NSError *error))completionBlock ++ (void)convertObjects:(NSArray *)objectsArray typeCache:(CMISBrowserTypeCache *)typeCache completionBlock:(void(^)(NSArray* objects, NSError *error))completionBlock { NSMutableArray *objects = [NSMutableArray arrayWithCapacity:objectsArray.count]; if (objectsArray.count > 0) { @@ -551,7 +551,7 @@ return properties; } -+ (void)convertSuccinctProperties:(NSDictionary *)propertiesJson propertiesExtension:(NSDictionary *)extJson typeCache:(CMISTypeCache *)typeCache completionBlock:(void(^)(CMISProperties *properties, NSError *error))completionBlock ++ (void)convertSuccinctProperties:(NSDictionary *)propertiesJson propertiesExtension:(NSDictionary *)extJson typeCache:(CMISBrowserTypeCache *)typeCache completionBlock:(void(^)(CMISProperties *properties, NSError *error))completionBlock { if (!propertiesJson) { completionBlock(nil, nil); @@ -604,7 +604,7 @@ } } -+(void)convertProperty:(NSString *)propName propertiesJson:(NSDictionary *)propertiesJson typeCache:(CMISTypeCache *)typeCache typeDefinition:(CMISTypeDefinition *)typeDef secondaryTypeDefinitions:(NSArray *)secTypeDefs completionBlock:(void(^)(CMISPropertyData *propertyData, NSError *error))completionBlock { ++(void)convertProperty:(NSString *)propName propertiesJson:(NSDictionary *)propertiesJson typeCache:(CMISBrowserTypeCache *)typeCache typeDefinition:(CMISTypeDefinition *)typeDef secondaryTypeDefinitions:(NSArray *)secTypeDefs completionBlock:(void(^)(CMISPropertyData *propertyData, NSError *error))completionBlock { CMISPropertyDefinition *propDef = nil; if (typeDef){ propDef = typeDef.propertyDefinitions[propName]; @@ -727,7 +727,7 @@ return dates; } -+ (void)convertProperties:(NSArray*)propNames position:(NSInteger)position properties:(CMISProperties *)properties propertiesJson:(NSDictionary *)propertiesJson typeCache:(CMISTypeCache *)typeCache typeDefinition:(CMISTypeDefinition *)typeDef secondaryTypeDefinitions:(NSArray *)secTypeDefs completionBlock:(void (^)(CMISProperties *properties, NSError *error))completionBlock ++ (void)convertProperties:(NSArray*)propNames position:(NSInteger)position properties:(CMISProperties *)properties propertiesJson:(NSDictionary *)propertiesJson typeCache:(CMISBrowserTypeCache *)typeCache typeDefinition:(CMISTypeDefinition *)typeDef secondaryTypeDefinitions:(NSArray *)secTypeDefs completionBlock:(void (^)(CMISProperties *properties, NSError *error))completionBlock { NSString *propName = [propNames objectAtIndex:position]; @@ -768,7 +768,7 @@ }]; } -+ (void)convertProperties:(NSDictionary *)propertiesJson typeCache:(CMISTypeCache *)typeCache typeDefinition:(CMISTypeDefinition *)typeDef secondaryTypeDefinitions:(NSArray *)secTypeDefs completionBlock:(void(^)(CMISProperties *properties, NSError *error))completionBlock ++ (void)convertProperties:(NSDictionary *)propertiesJson typeCache:(CMISBrowserTypeCache *)typeCache typeDefinition:(CMISTypeDefinition *)typeDef secondaryTypeDefinitions:(NSArray *)secTypeDefs completionBlock:(void(^)(CMISProperties *properties, NSError *error))completionBlock { // create properties CMISProperties *properties = [CMISProperties new]; @@ -875,7 +875,7 @@ return result; } -+ (void)retrieveTypeDefinitions:(NSArray *)objectTypeIds position:(NSInteger)position typeCache:(CMISTypeCache *)typeCache completionBlock:(void (^)(NSMutableArray *typeDefinitions, NSError *error))completionBlock ++ (void)retrieveTypeDefinitions:(NSArray *)objectTypeIds position:(NSInteger)position typeCache:(CMISBrowserTypeCache *)typeCache completionBlock:(void (^)(NSMutableArray *typeDefinitions, NSError *error))completionBlock { [typeCache typeDefinition:[objectTypeIds objectAtIndex:position] completionBlock:^(CMISTypeDefinition *typeDefinition, NSError *error) { @@ -900,7 +900,7 @@ }]; } -+ (void)retrieveTypeDefinitions:(NSArray *)objectTypeIds typeCache:(CMISTypeCache *)typeCache completionBlock:(void (^)(NSArray *typeDefinitions, NSError *error))completionBlock ++ (void)retrieveTypeDefinitions:(NSArray *)objectTypeIds typeCache:(CMISBrowserTypeCache *)typeCache completionBlock:(void (^)(NSArray *typeDefinitions, NSError *error))completionBlock { if (objectTypeIds.count > 0) { [CMISBrowserUtil retrieveTypeDefinitions:objectTypeIds
Modified: chemistry/objectivecmis/branches/browser-binding/ObjectiveCMIS/Bindings/Browser/CMISBrowserVersioningService.m URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/browser-binding/ObjectiveCMIS/Bindings/Browser/CMISBrowserVersioningService.m?rev=1591879&r1=1591878&r2=1591879&view=diff ============================================================================== --- chemistry/objectivecmis/branches/browser-binding/ObjectiveCMIS/Bindings/Browser/CMISBrowserVersioningService.m (original) +++ chemistry/objectivecmis/branches/browser-binding/ObjectiveCMIS/Bindings/Browser/CMISBrowserVersioningService.m Fri May 2 11:56:49 2014 @@ -25,7 +25,7 @@ #import "CMISURLUtil.h" #import "CMISConstants.h" #import "CMISErrors.h" -#import "CMISFormDataWriter.h" +#import "CMISBroswerFormDataWriter.h" #import "CMISFileUtil.h" #import "CMISLog.h" @@ -58,7 +58,7 @@ cmisRequest:cmisRequest completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) { if (httpResponse.statusCode == 200 && httpResponse.data) { - CMISTypeCache *typeCache = [[CMISTypeCache alloc] initWithRepositoryId:self.bindingSession.repositoryId bindingService:self]; + CMISBrowserTypeCache *typeCache = [[CMISBrowserTypeCache alloc] initWithRepositoryId:self.bindingSession.repositoryId bindingService:self]; NSError *parsingError = nil; [CMISBrowserUtil objectDataFromJSONData:httpResponse.data typeCache:typeCache completionBlock:^(CMISObjectData *objectData, NSError *error) { if (error) { @@ -93,7 +93,7 @@ cmisRequest:cmisRequest completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) { if (httpResponse.statusCode == 200 && httpResponse.data) { - CMISTypeCache *typeCache = [[CMISTypeCache alloc] initWithRepositoryId:self.bindingSession.repositoryId bindingService:self]; + CMISBrowserTypeCache *typeCache = [[CMISBrowserTypeCache alloc] initWithRepositoryId:self.bindingSession.repositoryId bindingService:self]; [CMISBrowserUtil objectListFromJSONData:httpResponse.data typeCache:typeCache isQueryResult:NO completionBlock:^(CMISObjectList *objectList, NSError *error) { if (error) { completionBlock(nil, error); @@ -128,7 +128,7 @@ NSString *objectUrl = [self getObjectUrlObjectId:objectId]; // prepare form data - CMISFormDataWriter *formData = [[CMISFormDataWriter alloc] initWithAction:kCMISBrowserJSONActionCheckOut]; + CMISBroswerFormDataWriter *formData = [[CMISBroswerFormDataWriter alloc] initWithAction:kCMISBrowserJSONActionCheckOut]; [formData addSuccinctFlag:true]; @@ -142,7 +142,7 @@ cmisRequest:cmisRequest completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) { if ((httpResponse.statusCode == 200 || httpResponse.statusCode == 201) && httpResponse.data) { - CMISTypeCache *typeCache = [[CMISTypeCache alloc] initWithRepositoryId:self.bindingSession.repositoryId bindingService:self]; + CMISBrowserTypeCache *typeCache = [[CMISBrowserTypeCache alloc] initWithRepositoryId:self.bindingSession.repositoryId bindingService:self]; [CMISBrowserUtil objectDataFromJSONData:httpResponse.data typeCache:typeCache completionBlock:^(CMISObjectData *objectData, NSError *error) { if (error) { completionBlock(nil, error); @@ -176,7 +176,7 @@ NSString *objectUrl = [self getObjectUrlObjectId:objectId]; // prepare form data - CMISFormDataWriter *formData = [[CMISFormDataWriter alloc] initWithAction:kCMISBrowserJSONActionCancelCheckOut]; + CMISBroswerFormDataWriter *formData = [[CMISBroswerFormDataWriter alloc] initWithAction:kCMISBrowserJSONActionCancelCheckOut]; CMISRequest *cmisRequest = [[CMISRequest alloc] init]; @@ -286,7 +286,7 @@ NSString *objectUrl = [self getObjectUrlObjectId:objectId]; // prepare form data - CMISFormDataWriter *formData = [[CMISFormDataWriter alloc] initWithAction:kCMISBrowserJSONActionCheckIn contentStream:inputStream mediaType:mimeType]; + CMISBroswerFormDataWriter *formData = [[CMISBroswerFormDataWriter alloc] initWithAction:kCMISBrowserJSONActionCheckIn contentStream:inputStream mediaType:mimeType]; [formData addParameter:kCMISParameterMajor boolValue:asMajorVersion]; [formData addPropertiesParameters:properties]; [formData addParameter:kCMISParameterCheckinComment value:checkinComment]; @@ -311,7 +311,7 @@ endData:formData.endData completionBlock:^(CMISHttpResponse *httpResponse, NSError *error) { if ((httpResponse.statusCode == 200 || httpResponse.statusCode == 201) && httpResponse.data) { - CMISTypeCache *typeCache = [[CMISTypeCache alloc] initWithRepositoryId:self.bindingSession.repositoryId bindingService:self]; + CMISBrowserTypeCache *typeCache = [[CMISBrowserTypeCache alloc] initWithRepositoryId:self.bindingSession.repositoryId bindingService:self]; [CMISBrowserUtil objectDataFromJSONData:httpResponse.data typeCache:typeCache completionBlock:^(CMISObjectData *objectData, NSError *error) { if (error) { completionBlock(nil, error); Modified: chemistry/objectivecmis/branches/browser-binding/ObjectiveCMIS/Utils/CMISURLUtil.m URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/browser-binding/ObjectiveCMIS/Utils/CMISURLUtil.m?rev=1591879&r1=1591878&r2=1591879&view=diff ============================================================================== --- chemistry/objectivecmis/branches/browser-binding/ObjectiveCMIS/Utils/CMISURLUtil.m (original) +++ chemistry/objectivecmis/branches/browser-binding/ObjectiveCMIS/Utils/CMISURLUtil.m Fri May 2 11:56:49 2014 @@ -23,13 +23,13 @@ NSString * const kCMISRFC7232Reserved = @";?:@&=+$,[]"; -@interface NSString (CMISUtil) +@interface NSString (CMISURLUtil) - (NSString *)replacePathWithPath:(NSString *)path; @end -@implementation NSString (CMISUtil) +@implementation NSString (CMISURLUtil) - (NSString *)replacePathWithPath:(NSString *)path { Modified: chemistry/objectivecmis/branches/browser-binding/ObjectiveCMISTests/ObjectiveCMISTests.m URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/branches/browser-binding/ObjectiveCMISTests/ObjectiveCMISTests.m?rev=1591879&r1=1591878&r2=1591879&view=diff ============================================================================== --- chemistry/objectivecmis/branches/browser-binding/ObjectiveCMISTests/ObjectiveCMISTests.m (original) +++ chemistry/objectivecmis/branches/browser-binding/ObjectiveCMISTests/ObjectiveCMISTests.m Fri May 2 11:56:49 2014 @@ -34,10 +34,9 @@ #import "CMISPagedResult.h" #import "CMISRenditionData.h" #import "CMISRendition.h" -#import "CMISAllowableActionsParser.h" #import "CMISAtomFeedParser.h" -#import "CMISServiceDocumentParser.h" -#import "CMISWorkspace.h" +#import "CMISAtomPubServiceDocumentParser.h" +#import "CMISAtomWorkspace.h" #import "CMISRequest.h" #import "CMISErrors.h" #import "CMISDateUtil.h" @@ -1652,11 +1651,11 @@ XCTAssertNotNil(atomData, @"AtomPubServiceDocument.xml is missing from the test target!"); NSError *error = nil; - CMISServiceDocumentParser *serviceDocParser = [[CMISServiceDocumentParser alloc] initWithData:atomData]; + CMISAtomPubServiceDocumentParser *serviceDocParser = [[CMISAtomPubServiceDocumentParser alloc] initWithData:atomData]; XCTAssertTrue([serviceDocParser parseAndReturnError:&error], @"Failed to parse AtomPubServiceDocument.xml"); NSArray *workspaces = [serviceDocParser workspaces]; - CMISWorkspace *workspace = [workspaces objectAtIndex:0]; + CMISAtomWorkspace *workspace = [workspaces objectAtIndex:0]; CMISRepositoryInfo *repoInfo = workspace.repositoryInfo; XCTAssertTrue(repoInfo.extensions.count == 2, @"Expected 2 extension elements, but found %lu", (unsigned long)repoInfo.extensions.count);
