chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pweschm...@apache.org
Subject svn commit: r1445217 [2/3] - in /chemistry/objectivecmis/trunk: ObjectiveCMIS.xcodeproj/ ObjectiveCMIS/Bindings/ ObjectiveCMIS/Bindings/AtomPub/ ObjectiveCMIS/Bindings/AtomPub/AtomPubParser/ ObjectiveCMIS/Client/ ObjectiveCMIS/Common/ ObjectiveCMIS/Uti...
Date Tue, 12 Feb 2013 16:00:07 GMT
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISDiscoveryService.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISDiscoveryService.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISDiscoveryService.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISDiscoveryService.h Tue Feb 12 16:00:06 2013
@@ -34,7 +34,7 @@
  * completionBlock returns the found object list or nil if unsuccessful
  */
 - (void)query:(NSString *)statement searchAllVersions:(BOOL)searchAllVersions
-                                 includeRelationShips:(CMISIncludeRelationship)includeRelationships
+                                        relationShips:(CMISIncludeRelationship)includeRelationships
                                       renditionFilter:(NSString *)renditionFilter
                               includeAllowableActions:(BOOL)includeAllowableActions
                                              maxItems:(NSNumber *)maxItems

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISLinkCache.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISLinkCache.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISLinkCache.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISLinkCache.h Tue Feb 12 16:00:06 2013
@@ -29,13 +29,13 @@
 - (id)initWithBindingSession:(CMISBindingSession *)bindingSession;
 
 /// retrieves the link for a given object Id/relationship
-- (NSString *)linkForObjectId:(NSString *)objectId andRelation:(NSString *)rel;
+- (NSString *)linkForObjectId:(NSString *)objectId relation:(NSString *)rel;
 
 /// retrieves the link for a given objectId, relationship and type
-- (NSString *)linkForObjectId:(NSString *)objectId andRelation:(NSString *)rel andType:(NSString *)type;
+- (NSString *)linkForObjectId:(NSString *)objectId relation:(NSString *)rel type:(NSString *)type;
 
 /// adds a link for object Id
-- (void)addLinks:(CMISLinkRelations *)links forObjectId:(NSString *)objectId;
+- (void)addLinks:(CMISLinkRelations *)links objectId:(NSString *)objectId;
 
 /// removes link for object Id
 - (void)removeLinksForObjectId:(NSString *)objectId;

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISLinkCache.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISLinkCache.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISLinkCache.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISLinkCache.m Tue Feb 12 16:00:06 2013
@@ -67,19 +67,19 @@
 //    self.linkCache.delegate = self;
 }
 
-- (NSString *)linkForObjectId:(NSString *)objectId andRelation:(NSString *)rel
+- (NSString *)linkForObjectId:(NSString *)objectId relation:(NSString *)rel
 {
     CMISLinkRelations *linkRelations = [self.linkCache objectForKey:objectId];
     return [linkRelations linkHrefForRel:rel];
 }
 
-- (NSString *)linkForObjectId:(NSString *)objectId andRelation:(NSString *)rel andType:(NSString *)type
+- (NSString *)linkForObjectId:(NSString *)objectId relation:(NSString *)rel type:(NSString *)type
 {
     CMISLinkRelations *linkRelations = [self.linkCache objectForKey:objectId];
     return [linkRelations linkHrefForRel:rel type:type];
 }
 
-- (void)addLinks:(CMISLinkRelations *)links forObjectId:(NSString *)objectId
+- (void)addLinks:(CMISLinkRelations *)links objectId:(NSString *)objectId
 {
     [self.linkCache setObject:links forKey:objectId];
 }

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISNavigationService.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISNavigationService.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISNavigationService.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISNavigationService.h Tue Feb 12 16:00:06 2013
@@ -29,10 +29,14 @@
  * Retrieves the children for the given object identifier.
  * completionBlock returns object list or nil if unsuccessful
  */
-- (void)retrieveChildren:(NSString *)objectId orderBy:(NSString *)orderBy
-                  filter:(NSString *)filter includeRelationShips:(CMISIncludeRelationship)includeRelationship
-         renditionFilter:(NSString *)renditionFilter includeAllowableActions:(BOOL)includeAllowableActions
-      includePathSegment:(BOOL)includePathSegment skipCount:(NSNumber *)skipCount
+- (void)retrieveChildren:(NSString *)objectId
+                 orderBy:(NSString *)orderBy
+                  filter:(NSString *)filter
+           relationShips:(CMISIncludeRelationship)includeRelationship
+         renditionFilter:(NSString *)renditionFilter
+ includeAllowableActions:(BOOL)includeAllowableActions
+      includePathSegment:(BOOL)includePathSegment
+               skipCount:(NSNumber *)skipCount
                 maxItems:(NSNumber *)maxItems
          completionBlock:(void (^)(CMISObjectList *objectList, NSError *error))completionBlock;
 
@@ -44,11 +48,11 @@
  * completionBlock returns array of parents or nil if unsuccessful
  */
 - (void)retrieveParentsForObject:(NSString *)objectId
-                      withFilter:(NSString *)filter
-        withIncludeRelationships:(CMISIncludeRelationship)includeRelationship
-             withRenditionFilter:(NSString *)renditionFilter
-     withIncludeAllowableActions:(BOOL)includeAllowableActions
-  withIncludeRelativePathSegment:(BOOL)includeRelativePathSegment
+                          filter:(NSString *)filter
+                   relationships:(CMISIncludeRelationship)includeRelationship
+                 renditionFilter:(NSString *)renditionFilter
+         includeAllowableActions:(BOOL)includeAllowableActions
+      includeRelativePathSegment:(BOOL)includeRelativePathSegment
                  completionBlock:(void (^)(NSArray *parents, NSError *error))completionBlock;
 
 

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISObjectService.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISObjectService.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISObjectService.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISObjectService.h Tue Feb 12 16:00:06 2013
@@ -31,12 +31,12 @@
  * completionBlock returns objectData for object or nil if unsuccessful
  */
 - (void)retrieveObject:(NSString *)objectId
-            withFilter:(NSString *)filter
-andIncludeRelationShips:(CMISIncludeRelationship)includeRelationship
-   andIncludePolicyIds:(BOOL)includePolicyIds
-    andRenditionFilder:(NSString *)renditionFilter
-         andIncludeACL:(BOOL)includeACL
-andIncludeAllowableActions:(BOOL)includeAllowableActions
+                filter:(NSString *)filter
+         relationShips:(CMISIncludeRelationship)includeRelationship
+      includePolicyIds:(BOOL)includePolicyIds
+       renditionFilder:(NSString *)renditionFilter
+            includeACL:(BOOL)includeACL
+    includeAllowableActions:(BOOL)includeAllowableActions
        completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock;
 
 /**
@@ -44,12 +44,12 @@ andIncludeAllowableActions:(BOOL)include
  * completionBlock returns objectData for object or nil if unsuccessful
  */
 - (void)retrieveObjectByPath:(NSString *)path
-                  withFilter:(NSString *)filter
-     andIncludeRelationShips:(CMISIncludeRelationship)includeRelationship
-         andIncludePolicyIds:(BOOL)includePolicyIds
-          andRenditionFilder:(NSString *)renditionFilter
-               andIncludeACL:(BOOL)includeACL
-  andIncludeAllowableActions:(BOOL)includeAllowableActions
+                      filter:(NSString *)filter
+               relationShips:(CMISIncludeRelationship)includeRelationship
+            includePolicyIds:(BOOL)includePolicyIds
+             renditionFilder:(NSString *)renditionFilter
+                  includeACL:(BOOL)includeACL
+     includeAllowableActions:(BOOL)includeAllowableActions
              completionBlock:(void (^)(CMISObjectData *objectData, NSError *error))completionBlock;
 
 /**
@@ -59,7 +59,7 @@ andIncludeAllowableActions:(BOOL)include
  *
  */
 - (CMISRequest*)downloadContentOfObject:(NSString *)objectId
-                           withStreamId:(NSString *)streamId
+                               streamId:(NSString *)streamId
                                  toFile:(NSString *)filePath
                         completionBlock:(void (^)(NSError *error))completionBlock
                           progressBlock:(void (^)(unsigned long long bytesDownloaded, unsigned long long bytesTotal))progressBlock;
@@ -71,7 +71,7 @@ andIncludeAllowableActions:(BOOL)include
  *
  */
 - (CMISRequest*)downloadContentOfObject:(NSString *)objectId
-                           withStreamId:(NSString *)streamId
+                               streamId:(NSString *)streamId
                          toOutputStream:(NSOutputStream *)outputStream
                         completionBlock:(void (^)(NSError *error))completionBlock
                           progressBlock:(void (^)(unsigned long long bytesDownloaded, unsigned long long bytesTotal))progressBlock;
@@ -87,7 +87,7 @@ andIncludeAllowableActions:(BOOL)include
  * completionBlock - returns NSError nil if successful
  */
 - (void)deleteContentOfObject:(CMISStringInOutParameter *)objectIdParam
-              withChangeToken:(CMISStringInOutParameter *)changeTokenParam
+                  changeToken:(CMISStringInOutParameter *)changeTokenParam
               completionBlock:(void (^)(NSError *error))completionBlock;
 
 /**
@@ -103,8 +103,8 @@ andIncludeAllowableActions:(BOOL)include
  */
 - (CMISRequest*)changeContentOfObject:(CMISStringInOutParameter *)objectIdParam
                       toContentOfFile:(NSString *)filePath
-                withOverwriteExisting:(BOOL)overwrite
-                      withChangeToken:(CMISStringInOutParameter *)changeTokenParam
+                    overwriteExisting:(BOOL)overwrite
+                          changeToken:(CMISStringInOutParameter *)changeTokenParam
                       completionBlock:(void (^)(NSError *error))completionBlock
                         progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock;
 
@@ -122,9 +122,9 @@ andIncludeAllowableActions:(BOOL)include
 - (CMISRequest*)changeContentOfObject:(CMISStringInOutParameter *)objectId
                toContentOfInputStream:(NSInputStream *)inputStream
                         bytesExpected:(unsigned long long)bytesExpected
-                         withFilename:(NSString *)filename
-                withOverwriteExisting:(BOOL)overwrite
-                      withChangeToken:(CMISStringInOutParameter *)changeToken
+                             filename:(NSString *)filename
+                    overwriteExisting:(BOOL)overwrite
+                          changeToken:(CMISStringInOutParameter *)changeToken
                       completionBlock:(void (^)(NSError *error))completionBlock
                         progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock;
 
@@ -134,8 +134,8 @@ andIncludeAllowableActions:(BOOL)include
  * completionBlock - returns NSError nil if successful
 */
 - (CMISRequest*)createDocumentFromFilePath:(NSString *)filePath
-                              withMimeType:(NSString *)mimeType
-                            withProperties:(CMISProperties *)properties
+                                  mimeType:(NSString *)mimeType
+                                properties:(CMISProperties *)properties
                                   inFolder:(NSString *)folderObjectId
                            completionBlock:(void (^)(NSString *objectId, NSError *error))completionBlock
                              progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock;
@@ -146,8 +146,8 @@ andIncludeAllowableActions:(BOOL)include
  * completionBlock - returns NSError nil if successful
  */
 - (CMISRequest*)createDocumentFromInputStream:(NSInputStream *)inputStream
-                                 withMimeType:(NSString *)mimeType
-                               withProperties:(CMISProperties *)properties
+                                     mimeType:(NSString *)mimeType
+                                   properties:(CMISProperties *)properties
                                      inFolder:(NSString *)folderObjectId
                                 bytesExpected:(unsigned long long)bytesExpected // optional
                               completionBlock:(void (^)(NSString *objectId, NSError *error))completionBlock
@@ -159,14 +159,16 @@ andIncludeAllowableActions:(BOOL)include
  * The allVersions parameter is currently ignored.
  * completionBlock returns true if successful
  */
-- (void)deleteObject:(NSString *)objectId allVersions:(BOOL)allVersions completionBlock:(void (^)(BOOL objectDeleted, NSError *error))completionBlock;
+- (void)deleteObject:(NSString *)objectId
+         allVersions:(BOOL)allVersions
+     completionBlock:(void (^)(BOOL objectDeleted, NSError *error))completionBlock;
 
 /**
  * Creates a new folder with given properties under the provided parent folder.
  * completionBlock returns objectId for the newly created folder or nil if unsuccessful
  */
 - (void)createFolderInParentFolder:(NSString *)folderObjectId
-                    withProperties:(CMISProperties *)properties
+                        properties:(CMISProperties *)properties
                    completionBlock:(void (^)(NSString *objectId, NSError *error))completionBlock;
 
 /**
@@ -187,8 +189,8 @@ andIncludeAllowableActions:(BOOL)include
  * completionBlock returns NSError nil if successful
  */
 - (void)updatePropertiesForObject:(CMISStringInOutParameter *)objectIdParam
-                   withProperties:(CMISProperties *)properties
-                  withChangeToken:(CMISStringInOutParameter *)changeTokenParam
+                       properties:(CMISProperties *)properties
+                      changeToken:(CMISStringInOutParameter *)changeTokenParam
                   completionBlock:(void (^)(NSError *error))completionBlock;
 
 /**
@@ -200,9 +202,9 @@ andIncludeAllowableActions:(BOOL)include
  * completionBlock returns array of associated renditions or nil if unsuccessful
  */
 - (void)retrieveRenditions:(NSString *)objectId
-            withRenditionFilter:(NSString *)renditionFilter
-                   withMaxItems:(NSNumber *)maxItems
-                  withSkipCount:(NSNumber *)skipCount
+                renditionFilter:(NSString *)renditionFilter
+                    maxItems:(NSNumber *)maxItems
+                    skipCount:(NSNumber *)skipCount
            completionBlock:(void (^)(NSArray *renditions, NSError *error))completionBlock;
 
 @end

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISQueryResult.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISQueryResult.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISQueryResult.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISQueryResult.h Tue Feb 12 16:00:06 2013
@@ -35,12 +35,12 @@
 /**
  * Initializes this query result.
  */
-- (id)initWithCmisObjectData:(CMISObjectData *)cmisObjectData andWithSession:(CMISSession *)session;
+- (id)initWithCmisObjectData:(CMISObjectData *)cmisObjectData session:(CMISSession *)session;
 
 /**
  * Convience method for the initializer.
  */
-+ (CMISQueryResult *)queryResultUsingCmisObjectData:(CMISObjectData *)cmisObjectData andWithSession:(CMISSession *)session;
++ (CMISQueryResult *)queryResultUsingCmisObjectData:(CMISObjectData *)cmisObjectData session:(CMISSession *)session;
 
 /**
  * Returns a property by id.

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISQueryResult.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISQueryResult.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISQueryResult.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISQueryResult.m Tue Feb 12 16:00:06 2013
@@ -37,7 +37,7 @@
 
 
 
-- (id)initWithCmisObjectData:(CMISObjectData *)cmisObjectData andWithSession:(CMISSession *)session
+- (id)initWithCmisObjectData:(CMISObjectData *)cmisObjectData session:(CMISSession *)session
 {
     self = [super init];
     if (self) {
@@ -47,7 +47,7 @@
         if (cmisObjectData.renditions != nil) {
             NSMutableArray *renditions = [NSMutableArray array];
             for (CMISRenditionData *renditionData in cmisObjectData.renditions) {
-                [renditions addObject:[[CMISRendition alloc] initWithRenditionData:renditionData andObjectId:cmisObjectData.identifier andSession:session]];
+                [renditions addObject:[[CMISRendition alloc] initWithRenditionData:renditionData objectId:cmisObjectData.identifier session:session]];
             }
             self.renditions = renditions;
         }
@@ -55,9 +55,9 @@
     return self;
 }
 
-+ (CMISQueryResult *)queryResultUsingCmisObjectData:(CMISObjectData *)cmisObjectData andWithSession:(CMISSession *)session
++ (CMISQueryResult *)queryResultUsingCmisObjectData:(CMISObjectData *)cmisObjectData session:(CMISSession *)session
 {
-    CMISQueryResult *queryResult = [[CMISQueryResult alloc] initWithCmisObjectData:cmisObjectData andWithSession:session];
+    CMISQueryResult *queryResult = [[CMISQueryResult alloc] initWithCmisObjectData:cmisObjectData session:session];
     return queryResult;
 }
 

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISRepositoryService.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISRepositoryService.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISRepositoryService.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Bindings/CMISRepositoryService.h Tue Feb 12 16:00:06 2013
@@ -34,12 +34,14 @@
  * Returns the repository info for the repository with the given id
  * completionBlock returns repository or nil if unsuccessful
  */
-- (void)retrieveRepositoryInfoForId:(NSString *)repositoryId completionBlock:(void (^)(CMISRepositoryInfo *repositoryInfo, NSError *error))completionBlock;
+- (void)retrieveRepositoryInfoForId:(NSString *)repositoryId
+                    completionBlock:(void (^)(CMISRepositoryInfo *repositoryInfo, NSError *error))completionBlock;
 
 /**
  * Returns the type definitions
  * completionBlock returns type definition or nil if unsuccessful
  */
-- (void)retrieveTypeDefinition:(NSString *)typeId completionBlock:(void (^)(CMISTypeDefinition *typeDefinition, NSError *error))completionBlock;
+- (void)retrieveTypeDefinition:(NSString *)typeId
+               completionBlock:(void (^)(CMISTypeDefinition *typeDefinition, NSError *error))completionBlock;
 
 @end

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISDocument.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISDocument.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISDocument.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISDocument.h Tue Feb 12 16:00:06 2013
@@ -58,7 +58,7 @@
  * The completionBlock returns the CMIS document or nil if unsuccessful
  */
 - (void)retrieveObjectOfLatestVersionWithMajorVersion:(BOOL)major
-                                 withOperationContext:(CMISOperationContext *)operationContext
+                                     operationContext:(CMISOperationContext *)operationContext
                                       completionBlock:(void (^)(CMISDocument *document, NSError *error))completionBlock;
 
 /**
@@ -87,7 +87,7 @@
  * completionBlock will return NSError nil if successful
  */
 - (CMISRequest*)changeContentToContentOfFile:(NSString *)filePath
-                       withOverwriteExisting:(BOOL)overwrite
+                                   overwrite:(BOOL)overwrite
                              completionBlock:(void (^)(NSError *error))completionBlock
                                progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock;
 
@@ -101,8 +101,8 @@
  */
 - (CMISRequest*)changeContentToContentOfInputStream:(NSInputStream *)inputStream
                                       bytesExpected:(unsigned long long)bytesExpected
-                                       withFileName:(NSString *)filename
-                              withOverwriteExisting:(BOOL)overwrite
+                                           fileName:(NSString *)fileName
+                                          overwrite:(BOOL)overwrite
                                     completionBlock:(void (^)(NSError *error))completionBlock
                                       progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock;
 

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISDocument.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISDocument.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISDocument.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISDocument.m Tue Feb 12 16:00:06 2013
@@ -44,9 +44,9 @@
 
 @implementation CMISDocument
 
-- (id)initWithObjectData:(CMISObjectData *)objectData withSession:(CMISSession *)session
+- (id)initWithObjectData:(CMISObjectData *)objectData session:(CMISSession *)session
 {
-    self = [super initWithObjectData:objectData withSession:session];
+    self = [super initWithObjectData:objectData session:session];
     if (self){
         self.contentStreamId = [[objectData.properties.propertiesDictionary objectForKey:kCMISProperyContentStreamId] firstValue];
         self.contentStreamMediaType = [[objectData.properties.propertiesDictionary objectForKey:kCMISPropertyContentStreamMediaType] firstValue];
@@ -73,38 +73,39 @@
            filter:operationContext.filterString includeAllowableActions:operationContext.includeAllowableActions completionBlock:^(NSArray *objects, NSError *error) {
                if (error) {
                    log(@"Error while retrieving all versions: %@", error.description);
-                   completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+                   completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
                } else {
                    completionBlock([self.session.objectConverter convertObjects:objects], nil);
                }
            }];
 }
 
-- (CMISRequest*)changeContentToContentOfFile:(NSString *)filePath withOverwriteExisting:(BOOL)overwrite
+- (CMISRequest*)changeContentToContentOfFile:(NSString *)filePath
+                                   overwrite:(BOOL)overwrite
                              completionBlock:(void (^)(NSError *error))completionBlock
                                progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock
 {
     return [self.binding.objectService changeContentOfObject:[CMISStringInOutParameter inOutParameterUsingInParameter:self.identifier]
                                              toContentOfFile:filePath
-                                       withOverwriteExisting:overwrite
-                                             withChangeToken:[CMISStringInOutParameter inOutParameterUsingInParameter:self.changeToken]
+                                           overwriteExisting:overwrite
+                                                 changeToken:[CMISStringInOutParameter inOutParameterUsingInParameter:self.changeToken]
                                              completionBlock:completionBlock
                                                progressBlock:progressBlock];
 }
 
 - (CMISRequest*)changeContentToContentOfInputStream:(NSInputStream *)inputStream
                                       bytesExpected:(unsigned long long)bytesExpected
-                                       withFileName:(NSString *)filename
-                              withOverwriteExisting:(BOOL)overwrite
+                                           fileName:(NSString *)filename
+                                          overwrite:(BOOL)overwrite
                                     completionBlock:(void (^)(NSError *error))completionBlock
                                       progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock
 {
     return [self.binding.objectService changeContentOfObject:[CMISStringInOutParameter inOutParameterUsingInParameter:self.identifier]
                                       toContentOfInputStream:inputStream
                                                bytesExpected:bytesExpected
-                                                withFilename:filename
-                                       withOverwriteExisting:overwrite
-                                             withChangeToken:[CMISStringInOutParameter inOutParameterUsingInParameter:self.changeToken]
+                                                    filename:filename
+                                           overwriteExisting:overwrite
+                                                 changeToken:[CMISStringInOutParameter inOutParameterUsingInParameter:self.changeToken]
                                              completionBlock:completionBlock
                                                progressBlock:progressBlock];
 }
@@ -112,17 +113,17 @@
 - (void)deleteContentWithCompletionBlock:(void (^)(NSError *error))completionBlock
 {
     [self.binding.objectService deleteContentOfObject:[CMISStringInOutParameter inOutParameterUsingInParameter:self.identifier]
-                                      withChangeToken:[CMISStringInOutParameter inOutParameterUsingInParameter:self.changeToken]
+                                      changeToken:[CMISStringInOutParameter inOutParameterUsingInParameter:self.changeToken]
                                       completionBlock:completionBlock];
 }
 
 - (void)retrieveObjectOfLatestVersionWithMajorVersion:(BOOL)major completionBlock:(void (^)(CMISDocument *document, NSError *error))completionBlock
 {
-    [self retrieveObjectOfLatestVersionWithMajorVersion:major withOperationContext:[CMISOperationContext defaultOperationContext] completionBlock:completionBlock];
+    [self retrieveObjectOfLatestVersionWithMajorVersion:major operationContext:[CMISOperationContext defaultOperationContext] completionBlock:completionBlock];
 }
 
 - (void)retrieveObjectOfLatestVersionWithMajorVersion:(BOOL)major
-                                 withOperationContext:(CMISOperationContext *)operationContext
+                                     operationContext:(CMISOperationContext *)operationContext
                                       completionBlock:(void (^)(CMISDocument *document, NSError *error))completionBlock
 {
     [self.binding.versioningService retrieveObjectOfLatestVersion:self.identifier
@@ -134,7 +135,7 @@
                                           includeAllowableActions:operationContext.includeAllowableActions
                                                   completionBlock:^(CMISObjectData *objectData, NSError *error) {
             if (error) {
-                completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+                completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
             } else {
                 completionBlock((CMISDocument *) [self.session.objectConverter convertObject:objectData], nil);
             }
@@ -147,7 +148,7 @@
 {
     NSOutputStream *outputStream = [NSOutputStream outputStreamToFileAtPath:filePath append:NO];
     return [self.binding.objectService downloadContentOfObject:self.identifier
-                                                  withStreamId:nil
+                                                      streamId:nil
                                                 toOutputStream:outputStream
                                                completionBlock:completionBlock
                                                  progressBlock:progressBlock];
@@ -159,7 +160,7 @@
                                 progressBlock:(void (^)(unsigned long long bytesDownloaded, unsigned long long bytesTotal))progressBlock
 {
     return [self.binding.objectService downloadContentOfObject:self.identifier
-                                                  withStreamId:nil
+                                                      streamId:nil
                                                 toOutputStream:outputStream
                                                completionBlock:completionBlock
                                                  progressBlock:progressBlock];

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFileableObject.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFileableObject.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFileableObject.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFileableObject.m Tue Feb 12 16:00:06 2013
@@ -34,11 +34,11 @@
                             completionBlock:(void (^)(NSArray *parentFolders, NSError *error))completionBlock
 {
     [self.binding.navigationService retrieveParentsForObject:self.identifier
-                                                  withFilter:operationContext.filterString
-                                    withIncludeRelationships:operationContext.includeRelationShips
-                                         withRenditionFilter:operationContext.renditionFilterString
-                                 withIncludeAllowableActions:operationContext.includeAllowableActions
-                              withIncludeRelativePathSegment:operationContext.includePathSegments
+                                                      filter:operationContext.filterString
+                                               relationships:operationContext.includeRelationShips
+                                             renditionFilter:operationContext.renditionFilterString
+                                     includeAllowableActions:operationContext.includeAllowableActions
+                                  includeRelativePathSegment:operationContext.includePathSegments
                                              completionBlock:^(NSArray *parentObjectDataArray, NSError *error) {
                                                  NSMutableArray *parentFolders = [NSMutableArray array];
                                                  for (CMISObjectData *parentObjectData in parentObjectDataArray){

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFolder.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFolder.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFolder.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFolder.h Tue Feb 12 16:00:06 2013
@@ -65,8 +65,8 @@
  * completionBlock returns object Id of newly created document or nil if not successful
  */
 - (void)createDocumentFromFilePath:(NSString *)filePath
-                      withMimeType:(NSString *)mimeType
-                    withProperties:(NSDictionary *)properties
+                          mimeType:(NSString *)mimeType
+                        properties:(NSDictionary *)properties
                    completionBlock:(void (^)(NSString *objectId, NSError *error))completionBlock
                      progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock;
 
@@ -75,8 +75,8 @@
  * completionBlock returns object Id of newly created document or nil if not successful
  */
 - (void)createDocumentFromInputStream:(NSInputStream *)inputStream
-                         withMimeType:(NSString *)mimeType
-                       withProperties:(NSDictionary *)properties
+                             mimeType:(NSString *)mimeType
+                           properties:(NSDictionary *)properties
                         bytesExpected:(unsigned long long)bytesExpected
                       completionBlock:(void (^)(NSString *objectId, NSError *error))completionBlock
                         progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock;
@@ -87,8 +87,8 @@
  * completionBlock returns list of failed objects (if any) 
  */
 - (void)deleteTreeWithDeleteAllVersions:(BOOL)deleteAllversions
-                      withUnfileObjects:(CMISUnfileObject)unfileObjects
-                  withContinueOnFailure:(BOOL)continueOnFailure
+                          unfileObjects:(CMISUnfileObject)unfileObjects
+                      continueOnFailure:(BOOL)continueOnFailure
                         completionBlock:(void (^)(NSArray *failedObjects, NSError *error))completionBlock;
 
 

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFolder.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFolder.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFolder.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISFolder.m Tue Feb 12 16:00:06 2013
@@ -35,9 +35,9 @@
 @implementation CMISFolder
 
 
-- (id)initWithObjectData:(CMISObjectData *)objectData withSession:(CMISSession *)session
+- (id)initWithObjectData:(CMISObjectData *)objectData session:(CMISSession *)session
 {
-    self = [super initWithObjectData:objectData withSession:session];
+    self = [super initWithObjectData:objectData session:session];
     if (self){
         self.path = [[objectData.properties propertyForId:kCMISPropertyPath] firstValue];
     }
@@ -78,7 +78,7 @@
         [self.binding.navigationService retrieveChildren:self.identifier
                                                  orderBy:operationContext.orderBy
                                                   filter:operationContext.filterString
-                                    includeRelationShips:operationContext.includeRelationShips
+                                           relationShips:operationContext.includeRelationShips
                                          renditionFilter:operationContext.renditionFilterString
                                  includeAllowableActions:operationContext.includeAllowableActions
                                       includePathSegment:operationContext.includePathSegments
@@ -86,7 +86,7 @@
                                                 maxItems:[NSNumber numberWithInt:maxItems]
                                          completionBlock:^(CMISObjectList *objectList, NSError *error) {
                                              if (error) {
-                                                 pageBlockCompletionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeConnection]);
+                                                 pageBlockCompletionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeConnection]);
                                              } else {
                                                  CMISFetchNextPageBlockResult *result = [[CMISFetchNextPageBlockResult alloc] init];
                                                  result.hasMoreItems = objectList.hasMoreItems;
@@ -99,11 +99,11 @@
     };
 
     [CMISPagedResult pagedResultUsingFetchBlock:fetchNextPageBlock
-                             andLimitToMaxItems:operationContext.maxItemsPerPage
-                          andStartFromSkipCount:operationContext.skipCount
+                                limitToMaxItems:operationContext.maxItemsPerPage
+                             startFromSkipCount:operationContext.skipCount
                           completionBlock:^(CMISPagedResult *result, NSError *error) {
                               if (error) {
-                                  completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+                                  completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
                               } else {
                                   completionBlock(result, nil);
                               }
@@ -116,10 +116,10 @@
                                     forObjectTypeId:[properties objectForKey:kCMISPropertyObjectTypeId]
                                     completionBlock:^(CMISProperties *properties, NSError *error) {
                      if (error) {
-                         completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+                         completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
                      } else {
                          [self.binding.objectService createFolderInParentFolder:self.identifier
-                                                                 withProperties:properties
+                                                                     properties:properties
                                                                 completionBlock:^(NSString *objectId, NSError *error) {
                                                                     completionBlock(objectId, error);
                                                                 }];
@@ -128,8 +128,8 @@
 }
 
 - (void)createDocumentFromFilePath:(NSString *)filePath
-                      withMimeType:(NSString *)mimeType
-                    withProperties:(NSDictionary *)properties
+                          mimeType:(NSString *)mimeType
+                        properties:(NSDictionary *)properties
                    completionBlock:(void (^)(NSString *objectId, NSError *error))completionBlock
                      progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock
 {
@@ -139,12 +139,12 @@
         if (error) {
             log(@"Could not convert properties: %@", error.description);
             if (completionBlock) {
-                completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+                completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
             }
         } else {
             [self.binding.objectService createDocumentFromFilePath:filePath
-                                                      withMimeType:mimeType
-                                                    withProperties:convertedProperties
+                                                          mimeType:mimeType
+                                                        properties:convertedProperties
                                                           inFolder:self.identifier
                                                    completionBlock:completionBlock
                                                      progressBlock:progressBlock];
@@ -153,8 +153,8 @@
 }
 
 - (void)createDocumentFromInputStream:(NSInputStream *)inputStream
-                         withMimeType:(NSString *)mimeType
-                       withProperties:(NSDictionary *)properties
+                             mimeType:(NSString *)mimeType
+                           properties:(NSDictionary *)properties
                         bytesExpected:(unsigned long long)bytesExpected
                       completionBlock:(void (^)(NSString *objectId, NSError *error))completionBlock
                         progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock
@@ -163,12 +163,12 @@
         if (nil == convertedProperties){
             log(@"Could not convert properties: %@", error.description);
             if (completionBlock) {
-                completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+                completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
             }
         } else {
             [self.binding.objectService createDocumentFromInputStream:inputStream
-                                                         withMimeType:mimeType
-                                                       withProperties:convertedProperties
+                                                             mimeType:mimeType
+                                                           properties:convertedProperties
                                                              inFolder:self.identifier
                                                         bytesExpected:bytesExpected
                                                       completionBlock:completionBlock
@@ -179,9 +179,9 @@
 
 
 - (void)deleteTreeWithDeleteAllVersions:(BOOL)deleteAllversions
-                           withUnfileObjects:(CMISUnfileObject)unfileObjects
-                       withContinueOnFailure:(BOOL)continueOnFailure
-                             completionBlock:(void (^)(NSArray *failedObjects, NSError *error))completionBlock
+                          unfileObjects:(CMISUnfileObject)unfileObjects
+                      continueOnFailure:(BOOL)continueOnFailure
+                        completionBlock:(void (^)(NSArray *failedObjects, NSError *error))completionBlock
 {
     [self.binding.objectService deleteTree:self.identifier allVersion:deleteAllversions
                                     unfileObjects:unfileObjects continueOnFailure:continueOnFailure completionBlock:completionBlock];

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISObject.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISObject.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISObject.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISObject.h Tue Feb 12 16:00:06 2013
@@ -47,7 +47,7 @@
 /**
  * initialise CMISObject with data and session
  */
-- (id)initWithObjectData:(CMISObjectData *)objectData withSession:(CMISSession *)session;
+- (id)initWithObjectData:(CMISObjectData *)objectData session:(CMISSession *)session;
 
 /**
  * Updates the properties that are provided.

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISObject.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISObject.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISObject.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISObject.m Tue Feb 12 16:00:06 2013
@@ -52,7 +52,7 @@
 
 @implementation CMISObject
 
-- (id)initWithObjectData:(CMISObjectData *)objectData withSession:(CMISSession *)session
+- (id)initWithObjectData:(CMISObjectData *)objectData session:(CMISSession *)session
 {
     self =  [super initWithString:objectData.identifier];
     if (self) {
@@ -80,7 +80,7 @@
         if (objectData.renditions != nil) {
             NSMutableArray *renditions = [NSMutableArray array];
             for (CMISRenditionData *renditionData in objectData.renditions) {
-                [renditions addObject:[[CMISRendition alloc] initWithRenditionData:renditionData andObjectId:self.identifier andSession:session]];
+                [renditions addObject:[[CMISRendition alloc] initWithRenditionData:renditionData objectId:self.identifier session:session]];
             }
             self.renditions = renditions;
         }
@@ -98,7 +98,7 @@
 {
     // Validate properties param
     if (!properties || properties.count == 0) {
-        completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument withDetailedDescription:@"Properties cannot be nil or empty"]);
+        completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument detailedDescription:@"Properties cannot be nil or empty"]);
         return;
     }
 
@@ -109,8 +109,8 @@
             CMISStringInOutParameter *changeTokenInOutParam = [CMISStringInOutParameter inOutParameterUsingInParameter:self.changeToken];
             [self.binding.objectService
              updatePropertiesForObject:objectIdInOutParam
-             withProperties:convertedProperties
-             withChangeToken:changeTokenInOutParam
+             properties:convertedProperties
+             changeToken:changeTokenInOutParam
              completionBlock:^(NSError *error) {
                  if (objectIdInOutParam.outParameter) {
                      [self.session retrieveObject:objectIdInOutParam.outParameter
@@ -118,11 +118,11 @@
                                       completionBlock(object, error);
                                   }];
                  } else {
-                     completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+                     completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
                  }
              }];
         } else {
-            completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+            completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
         }
     }];
 }

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISPagedResult.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISPagedResult.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISPagedResult.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISPagedResult.h Tue Feb 12 16:00:06 2013
@@ -48,7 +48,8 @@ typedef void (^CMISFetchNextPageBlock)(i
  * completionBlock returns paged results or nil if unsuccessful
  */
 + (void)pagedResultUsingFetchBlock:(CMISFetchNextPageBlock)fetchNextPageBlock
-                andLimitToMaxItems:(NSInteger)maxItems andStartFromSkipCount:(NSInteger)skipCount
+                   limitToMaxItems:(NSInteger)maxItems
+                startFromSkipCount:(NSInteger)skipCount
                    completionBlock:(void (^)(CMISPagedResult *result, NSError *error))completionBlock;
 
 /**

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISPagedResult.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISPagedResult.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISPagedResult.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISPagedResult.m Tue Feb 12 16:00:06 2013
@@ -53,8 +53,10 @@
 /** Internal init */
 - (id)initWithResultArray:(NSArray *)resultArray
  retrievedUsingFetchBlock:(CMISFetchNextPageBlock)fetchNextPageBlock
-              andNumItems:(NSInteger)numItems andHasMoreItems:(BOOL)hasMoreItems
-              andMaxItems:(NSInteger)maxItems andSkipCount:(NSInteger)skipCount;
+                 numItems:(NSInteger)numItems
+             hasMoreItems:(BOOL)hasMoreItems
+                 maxItems:(NSInteger)maxItems
+                skipCount:(NSInteger)skipCount;
 {
     self = [super init];
     if (self) {
@@ -69,20 +71,21 @@
 }
 
 + (void)pagedResultUsingFetchBlock:(CMISFetchNextPageBlock)fetchNextPageBlock
-                andLimitToMaxItems:(NSInteger)maxItems andStartFromSkipCount:(NSInteger)skipCount
+                   limitToMaxItems:(NSInteger)maxItems
+                startFromSkipCount:(NSInteger)skipCount
                    completionBlock:(void (^)(CMISPagedResult *result, NSError *error))completionBlock
 {
     // Fetch the first requested page
     fetchNextPageBlock(skipCount, maxItems, ^(CMISFetchNextPageBlockResult *result, NSError *error) {
         if (error) {
-            completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+            completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
         } else {
             completionBlock([[CMISPagedResult alloc] initWithResultArray:result.resultArray
                                                 retrievedUsingFetchBlock:fetchNextPageBlock
-                                                             andNumItems:result.numItems
-                                                         andHasMoreItems:result.hasMoreItems
-                                                             andMaxItems:maxItems
-                                                            andSkipCount:skipCount],
+                                                                numItems:result.numItems
+                                                            hasMoreItems:result.hasMoreItems
+                                                                maxItems:maxItems
+                                                               skipCount:skipCount],
                             nil);
         }
     });
@@ -91,8 +94,8 @@
 - (void)fetchNextPageWithCompletionBlock:(void (^)(CMISPagedResult *result, NSError *error))completionBlock
 {
     [CMISPagedResult pagedResultUsingFetchBlock:self.fetchNextPageBlock
-                             andLimitToMaxItems:self.maxItems
-                          andStartFromSkipCount:(self.skipCount + self.resultArray.count)
+                                limitToMaxItems:self.maxItems
+                             startFromSkipCount:(self.skipCount + self.resultArray.count)
                                 completionBlock:completionBlock];
 }
 
@@ -102,7 +105,7 @@
     for (CMISObject *object in self.resultArray) {
         enumerationBlock(object, &stop);
         if (stop) {
-            NSError *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeCancelled withDetailedDescription:@"Item enumeration was stopped"];
+            NSError *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeCancelled detailedDescription:@"Item enumeration was stopped"];
             completionBlock(error);
             return;
         }

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISRendition.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISRendition.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISRendition.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISRendition.h Tue Feb 12 16:00:06 2013
@@ -30,7 +30,7 @@
 /**
  initialiser
  */
-- (id)initWithRenditionData:(CMISRenditionData *)renditionData andObjectId:(NSString *)objectId andSession:(CMISSession *)session;
+- (id)initWithRenditionData:(CMISRenditionData *)renditionData objectId:(NSString *)objectId session:(CMISSession *)session;
 
 /**
  * retrieves the rendition, e.g. thumbnail of a document

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISRendition.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISRendition.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISRendition.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISRendition.m Tue Feb 12 16:00:06 2013
@@ -32,7 +32,7 @@
 @implementation CMISRendition
 
 
-- (id)initWithRenditionData:(CMISRenditionData *)renditionData andObjectId:(NSString *)objectId andSession:(CMISSession *)session
+- (id)initWithRenditionData:(CMISRenditionData *)renditionData objectId:(NSString *)objectId session:(CMISSession *)session
 {
     self = [super initWithRenditionData:renditionData];
     if (self) {
@@ -56,7 +56,7 @@
         return;
     }
 
-    [self.session retrieveObject:self.renditionDocumentId withOperationContext:operationContext completionBlock:^(CMISObject *renditionDocument, NSError *error) {
+    [self.session retrieveObject:self.renditionDocumentId operationContext:operationContext completionBlock:^(CMISObject *renditionDocument, NSError *error) {
         if (renditionDocument != nil && !([[renditionDocument class] isKindOfClass:[CMISDocument class]])) {
             completionBlock(nil, nil);
             return;
@@ -76,7 +76,7 @@
     }
 
     [self.session.binding.objectService downloadContentOfObject:self.objectId
-                                                   withStreamId:self.streamId
+                                                       streamId:self.streamId
                                                          toFile:filePath
                                                 completionBlock:completionBlock
                                                   progressBlock:progressBlock];
@@ -92,7 +92,7 @@
     }
     
     [self.session.binding.objectService downloadContentOfObject:self.objectId
-                                                   withStreamId:self.streamId
+                                                       streamId:self.streamId
                                                          toOutputStream:outputStream
                                                 completionBlock:completionBlock
                                                   progressBlock:progressBlock];

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISSession.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISSession.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISSession.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISSession.h Tue Feb 12 16:00:06 2013
@@ -88,7 +88,7 @@
   * completionBlock returns the CMIS object or nil if unsuccessful
   */
 - (void)retrieveObject:(NSString *)objectId
-  withOperationContext:(CMISOperationContext *)operationContext
+      operationContext:(CMISOperationContext *)operationContext
        completionBlock:(void (^)(CMISObject *object, NSError *error))completionBlock;
 
 /**
@@ -104,7 +104,7 @@
  * completionBlock returns the CMIS object or nil if unsuccessful
  */
 - (void)retrieveObjectByPath:(NSString *)path
-        withOperationContext:(CMISOperationContext *)operationContext
+            operationContext:(CMISOperationContext *)operationContext
              completionBlock:(void (^)(CMISObject *object, NSError *error))completionBlock;
 
 /**
@@ -135,7 +135,7 @@
  * completionBlock returns the search results as a paged results object or nil if unsuccessful.
  */
 - (void)queryObjectsWithTypeid:(NSString *)typeId
-               withWhereClause:(NSString *)whereClause
+                   whereClause:(NSString *)whereClause
              searchAllVersions:(BOOL)searchAllVersion
               operationContext:(CMISOperationContext *)operationContext
                completionBlock:(void (^)(CMISPagedResult *result, NSError *error))completionBlock;
@@ -173,8 +173,8 @@
  * completionBlock returns object Id of newly created object or nil if unsuccessful
  */
 - (void)createDocumentFromFilePath:(NSString *)filePath
-                      withMimeType:(NSString *)mimeType
-                    withProperties:(NSDictionary *)properties
+                          mimeType:(NSString *)mimeType
+                        properties:(NSDictionary *)properties
                           inFolder:(NSString *)folderObjectId
                    completionBlock:(void (^)(NSString *objectId, NSError *error))completionBlock
                      progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock;
@@ -184,8 +184,8 @@
  * completionBlock returns object Id of newly created object or nil if unsuccessful
  */
 - (void)createDocumentFromInputStream:(NSInputStream *)inputStream
-                         withMimeType:(NSString *)mimeType
-                       withProperties:(NSDictionary *)properties
+                             mimeType:(NSString *)mimeType
+                           properties:(NSDictionary *)properties
                              inFolder:(NSString *)folderObjectId
                         bytesExpected:(unsigned long long)bytesExpected
                       completionBlock:(void (^)(NSString *objectId, NSError *error))completionBlock

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISSession.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISSession.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISSession.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Client/CMISSession.m Tue Feb 12 16:00:06 2013
@@ -70,7 +70,7 @@
         [session authenticateWithCompletionBlock:completionBlock];
     } else {
         completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument
-                                         withDetailedDescription:@"Not enough session parameters to connect"]);
+                                             detailedDescription:@"Not enough session parameters to connect"]);
     }
 }
 
@@ -93,7 +93,7 @@
             }
             
             self.sessionParameters.authenticationProvider = [[CMISStandardAuthenticationProvider alloc] initWithUsername:username
-                                                                                                             andPassword:password];
+                                                                                                                password:password];
         }
 
         if (self.sessionParameters.networkProvider == nil) {
@@ -128,14 +128,14 @@
     // check repository id is present
     if (self.sessionParameters.repositoryId == nil) {
         NSError *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument
-                                     withDetailedDescription:@"Must provide repository id"];
+                                         detailedDescription:@"Must provide repository id"];
         log(@"Error: %@", error.description);
         completionBlock(nil, error);
         return;
     }
     
     if (self.sessionParameters.authenticationProvider == nil) {
-        NSError *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeUnauthorized withDetailedDescription:@"Must provide authentication provider"];
+        NSError *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeUnauthorized detailedDescription:@"Must provide authentication provider"];
         log(@"Error: %@", error.description);
         completionBlock(nil, error);
         return;
@@ -149,10 +149,10 @@
         if (self.repositoryInfo == nil) {
             if (error) {
                 log(@"Error because repositoryInfo is nil: %@", error.description);
-                completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeInvalidArgument]);
+                completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeInvalidArgument]);
             } else {
                 completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument
-                                                 withDetailedDescription:@"Could not fetch repository information"]);
+                                                     detailedDescription:@"Could not fetch repository information"]);
             }
         } else {
             // no errors have occurred so set authenticated flag and return success flag
@@ -173,9 +173,9 @@
 - (void)retrieveFolderWithOperationContext:(CMISOperationContext *)operationContext completionBlock:(void (^)(CMISFolder *folder, NSError *error))completionBlock
 {
     NSString *rootFolderId = self.repositoryInfo.rootFolderId;
-    [self retrieveObject:rootFolderId withOperationContext:operationContext completionBlock:^(CMISObject *rootFolder, NSError *error) {
+    [self retrieveObject:rootFolderId operationContext:operationContext completionBlock:^(CMISObject *rootFolder, NSError *error) {
         if (rootFolder != nil && ![rootFolder isKindOfClass:[CMISFolder class]]) {
-            completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeRuntime withDetailedDescription:@"Root folder object is not a folder!"]);
+            completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeRuntime detailedDescription:@"Root folder object is not a folder!"]);
         } else {
             completionBlock((CMISFolder *)rootFolder, nil);
         }
@@ -184,28 +184,30 @@
 
 - (void)retrieveObject:(NSString *)objectId completionBlock:(void (^)(CMISObject *object, NSError *error))completionBlock
 {
-    [self retrieveObject:objectId withOperationContext:[CMISOperationContext defaultOperationContext] completionBlock:completionBlock];
+    [self retrieveObject:objectId operationContext:[CMISOperationContext defaultOperationContext] completionBlock:completionBlock];
 }
 
-- (void)retrieveObject:(NSString *)objectId withOperationContext:(CMISOperationContext *)operationContext completionBlock:(void (^)(CMISObject *object, NSError *error))completionBlock
+- (void)retrieveObject:(NSString *)objectId
+      operationContext:(CMISOperationContext *)operationContext
+       completionBlock:(void (^)(CMISObject *object, NSError *error))completionBlock
 {
     if (objectId == nil) {
-        completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument withDetailedDescription:@"Must provide object id"]);
+        completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument detailedDescription:@"Must provide object id"]);
         return;
     }
 
     // TODO: cache the object
 
     [self.binding.objectService retrieveObject:objectId
-                                    withFilter:operationContext.filterString
-                       andIncludeRelationShips:operationContext.includeRelationShips
-                           andIncludePolicyIds:operationContext.includePolicies
-                            andRenditionFilder:operationContext.renditionFilterString
-                                 andIncludeACL:operationContext.includeACLs
-                    andIncludeAllowableActions:operationContext.includeAllowableActions
+                                        filter:operationContext.filterString
+                                 relationShips:operationContext.includeRelationShips
+                              includePolicyIds:operationContext.includePolicies
+                               renditionFilder:operationContext.renditionFilterString
+                                    includeACL:operationContext.includeACLs
+                       includeAllowableActions:operationContext.includeAllowableActions
                                completionBlock:^(CMISObjectData *objectData, NSError *error) {
                                             if (error) {
-                                                completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeObjectNotFound]);
+                                                completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeObjectNotFound]);
                                             } else {
                                                 CMISObject *object = nil;
                                                 if (objectData) {
@@ -218,18 +220,20 @@
 
 - (void)retrieveObjectByPath:(NSString *)path completionBlock:(void (^)(CMISObject *object, NSError *error))completionBlock
 {
-    [self retrieveObjectByPath:path withOperationContext:[CMISOperationContext defaultOperationContext] completionBlock:completionBlock];
+    [self retrieveObjectByPath:path operationContext:[CMISOperationContext defaultOperationContext] completionBlock:completionBlock];
 }
 
-- (void)retrieveObjectByPath:(NSString *)path withOperationContext:(CMISOperationContext *)operationContext completionBlock:(void (^)(CMISObject *object, NSError *error))completionBlock
+- (void)retrieveObjectByPath:(NSString *)path
+            operationContext:(CMISOperationContext *)operationContext
+             completionBlock:(void (^)(CMISObject *object, NSError *error))completionBlock
 {
     [self.binding.objectService retrieveObjectByPath:path
-                                          withFilter:operationContext.filterString
-                             andIncludeRelationShips:operationContext.includeRelationShips
-                                 andIncludePolicyIds:operationContext.includePolicies
-                                  andRenditionFilder:operationContext.renditionFilterString
-                                       andIncludeACL:operationContext.includeACLs
-                          andIncludeAllowableActions:operationContext.includeAllowableActions
+                                              filter:operationContext.filterString
+                                       relationShips:operationContext.includeRelationShips
+                                    includePolicyIds:operationContext.includePolicies
+                                     renditionFilder:operationContext.renditionFilterString
+                                          includeACL:operationContext.includeACLs
+                             includeAllowableActions:operationContext.includeAllowableActions
                                      completionBlock:^(CMISObjectData *objectData, NSError *error) {
                                          if (objectData != nil && error == nil) {
                                              completionBlock([self.objectConverter convertObject:objectData], nil);
@@ -260,14 +264,14 @@
         // Fetch results through discovery service
         [self.binding.discoveryService query:statement
                                                   searchAllVersions:searchAllVersion
-                                                  includeRelationShips:operationContext.includeRelationShips
+                                                  relationShips:operationContext.includeRelationShips
                                                   renditionFilter:operationContext.renditionFilterString
                                                   includeAllowableActions:operationContext.includeAllowableActions
                                                   maxItems:[NSNumber numberWithInt:maxItems]
                                                   skipCount:[NSNumber numberWithInt:skipCount]
                                                   completionBlock:^(CMISObjectList *objectList, NSError *error) {
                                                       if (error) {
-                                                          pageBlockCompletionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+                                                          pageBlockCompletionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
                                                       } else {
                                                           // Fill up return result
                                                           CMISFetchNextPageBlockResult *result = [[CMISFetchNextPageBlockResult alloc] init];
@@ -277,7 +281,7 @@
                                                           NSMutableArray *resultArray = [[NSMutableArray alloc] init];
                                                           result.resultArray = resultArray;
                                                           for (CMISObjectData *objectData in objectList.objects) {
-                                                              [resultArray addObject:[CMISQueryResult queryResultUsingCmisObjectData:objectData andWithSession:self]];
+                                                              [resultArray addObject:[CMISQueryResult queryResultUsingCmisObjectData:objectData session:self]];
                                                           }
                                                           pageBlockCompletionBlock(result, nil);
                                                       }
@@ -285,12 +289,12 @@
     };
 
     [CMISPagedResult pagedResultUsingFetchBlock:fetchNextPageBlock
-                             andLimitToMaxItems:operationContext.maxItemsPerPage
-                          andStartFromSkipCount:operationContext.skipCount
+                                limitToMaxItems:operationContext.maxItemsPerPage
+                             startFromSkipCount:operationContext.skipCount
                                 completionBlock:^(CMISPagedResult *result, NSError *error) {
                                     // Return nil and populate error in case something went wrong
                                     if (error) {
-                                        completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+                                        completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
                                     } else {
                                         completionBlock(result, nil);
                                     }
@@ -298,7 +302,7 @@
 }
 
 - (void)queryObjectsWithTypeDefinition:(CMISTypeDefinition *)typeDefinition
-                       withWhereClause:(NSString *)whereClause
+                           whereClause:(NSString *)whereClause
                      searchAllVersions:(BOOL)searchAllVersion
                       operationContext:(CMISOperationContext *)operationContext
                        completionBlock:(void (^)(CMISPagedResult *result, NSError *error))completionBlock
@@ -328,14 +332,14 @@
         // Fetch results through discovery service
         [self.binding.discoveryService query:statement
                            searchAllVersions:searchAllVersion
-                        includeRelationShips:operationContext.includeRelationShips
+                               relationShips:operationContext.includeRelationShips
                              renditionFilter:operationContext.renditionFilterString
                      includeAllowableActions:operationContext.includeAllowableActions
                                     maxItems:[NSNumber numberWithInt:maxItems]
                                    skipCount:[NSNumber numberWithInt:skipCount]
                              completionBlock:^(CMISObjectList *objectList, NSError *error) {
                                  if (error) {
-                                     pageBlockCompletionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+                                     pageBlockCompletionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
                                  } else {
                                      // Fill up return result
                                      CMISFetchNextPageBlockResult *result = [[CMISFetchNextPageBlockResult alloc] init];
@@ -354,12 +358,12 @@
     };
     
     [CMISPagedResult pagedResultUsingFetchBlock:fetchNextPageBlock
-                             andLimitToMaxItems:operationContext.maxItemsPerPage
-                          andStartFromSkipCount:operationContext.skipCount
+                                limitToMaxItems:operationContext.maxItemsPerPage
+                             startFromSkipCount:operationContext.skipCount
                                 completionBlock:^(CMISPagedResult *result, NSError *error) {
                                     // Return nil and populate error in case something went wrong
                                     if (error) {
-                                        completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+                                        completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
                                     } else {
                                         completionBlock(result, nil);
                                     }
@@ -367,7 +371,7 @@
 }
 
 - (void)queryObjectsWithTypeid:(NSString *)typeId
-               withWhereClause:(NSString *)whereClause
+                   whereClause:(NSString *)whereClause
              searchAllVersions:(BOOL)searchAllVersion
               operationContext:(CMISOperationContext *)operationContext
                completionBlock:(void (^)(CMISPagedResult *result, NSError *error))completionBlock
@@ -375,11 +379,11 @@
     [self retrieveTypeDefinition:typeId
                  completionBlock:^(CMISTypeDefinition *typeDefinition, NSError *internalError) {
                      if (internalError != nil) {
-                         NSError *error = [CMISErrors cmisError:internalError withCMISErrorCode:kCMISErrorCodeRuntime];
+                         NSError *error = [CMISErrors cmisError:internalError cmisErrorCode:kCMISErrorCodeRuntime];
                          completionBlock(nil, error);
                      } else {
                          [self queryObjectsWithTypeDefinition:typeDefinition
-                                              withWhereClause:whereClause
+                                                  whereClause:whereClause
                                             searchAllVersions:searchAllVersion
                                              operationContext:operationContext
                                               completionBlock:completionBlock];
@@ -395,10 +399,10 @@
                             forObjectTypeId:[properties objectForKey:kCMISPropertyObjectTypeId]
                             completionBlock:^(CMISProperties *convertedProperties, NSError *error) {
                                if (error) {
-                                   completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+                                   completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
                                } else {
                                    [self.binding.objectService createFolderInParentFolder:folderObjectId
-                                                                           withProperties:convertedProperties
+                                                                               properties:convertedProperties
                                                                           completionBlock:^(NSString *objectId, NSError *error) {
                                                                               completionBlock(objectId, error);
                                                                           }];
@@ -412,7 +416,7 @@
                               progressBlock:(void (^)(unsigned long long bytesDownloaded, unsigned long long bytesTotal))progressBlock
 {
     return [self.binding.objectService downloadContentOfObject:objectId
-                                                  withStreamId:nil
+                                                      streamId:nil
                                                         toFile:filePath
                                                completionBlock:completionBlock
                                                  progressBlock:progressBlock];
@@ -424,15 +428,16 @@
                               progressBlock:(void (^)(unsigned long long bytesDownloaded, unsigned long long bytesTotal))progressBlock
 {
     return [self.binding.objectService downloadContentOfObject:objectId
-                                                  withStreamId:nil
+                                                      streamId:nil
                                                 toOutputStream:outputStream
                                                completionBlock:completionBlock
                                                  progressBlock:progressBlock];
 }
 
 
-- (void)createDocumentFromFilePath:(NSString *)filePath withMimeType:(NSString *)mimeType
-                    withProperties:(NSDictionary *)properties inFolder:(NSString *)folderObjectId
+- (void)createDocumentFromFilePath:(NSString *)filePath
+                          mimeType:(NSString *)mimeType
+                        properties:(NSDictionary *)properties inFolder:(NSString *)folderObjectId
                    completionBlock:(void (^)(NSString *objectId, NSError *error))completionBlock
                      progressBlock:(void (^)(unsigned long long bytesUploaded, unsigned long long bytesTotal))progressBlock
 {
@@ -442,12 +447,12 @@
         if (error) {
             log(@"Could not convert properties: %@", error.description);
             if (completionBlock) {
-                completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+                completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
             }
         } else {
             [self.binding.objectService createDocumentFromFilePath:filePath
-                                                      withMimeType:mimeType
-                                                    withProperties:convertedProperties
+                                                          mimeType:mimeType
+                                                        properties:convertedProperties
                                                       inFolder:folderObjectId
                                                    completionBlock:completionBlock
                                                      progressBlock:progressBlock];
@@ -456,8 +461,8 @@
 }
 
 - (void)createDocumentFromInputStream:(NSInputStream *)inputStream
-                         withMimeType:(NSString *)mimeType
-                       withProperties:(NSDictionary *)properties
+                             mimeType:(NSString *)mimeType
+                           properties:(NSDictionary *)properties
                              inFolder:(NSString *)folderObjectId
                         bytesExpected:(unsigned long long)bytesExpected
                       completionBlock:(void (^)(NSString *objectId, NSError *error))completionBlock
@@ -469,12 +474,12 @@
         if (error) {
             log(@"Could not convert properties: %@", error.description);
             if (completionBlock) {
-                completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+                completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
             }
         } else {
             [self.binding.objectService createDocumentFromInputStream:inputStream
-                                                         withMimeType:mimeType
-                                                       withProperties:convertedProperties
+                                                             mimeType:mimeType
+                                                           properties:convertedProperties
                                                              inFolder:folderObjectId
                                                         bytesExpected:bytesExpected
                                                       completionBlock:completionBlock

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISErrors.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISErrors.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISErrors.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISErrors.h Tue Feb 12 16:00:06 2013
@@ -113,7 +113,7 @@ extern NSString * const kCMISErrorDescri
  @param code the CMIS error code
  @return the CMIS error as NSError object with error domain org.apache.chemistry.objectivecmis
  */
-+ (NSError *)cmisError:(NSError *)error withCMISErrorCode:(CMISErrorCodes)code;
++ (NSError *)cmisError:(NSError *)error cmisErrorCode:(CMISErrorCodes)code;
 /** Creates a new CMIS error
  
  This is the direct way of creating CMIS errors
@@ -122,6 +122,6 @@ extern NSString * const kCMISErrorDescri
  @param detailedDescription a detailed description to be added to the localizedDescription. Use nil if none is available/needed.
  @return the CMIS error as NSError object with error domain org.apache.chemistry.objectivecmis
  */
-+ (NSError *)createCMISErrorWithCode:(CMISErrorCodes)code withDetailedDescription:(NSString *)detailedDescription;
++ (NSError *)createCMISErrorWithCode:(CMISErrorCodes)code detailedDescription:(NSString *)detailedDescription;
 @end
 

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISErrors.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISErrors.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISErrors.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISErrors.m Tue Feb 12 16:00:06 2013
@@ -60,7 +60,7 @@ NSString * const kCMISErrorDescriptionVe
 
 @implementation CMISErrors
 
-+ (NSError *)cmisError:(NSError *)error withCMISErrorCode:(CMISErrorCodes)code
++ (NSError *)cmisError:(NSError *)error cmisErrorCode:(CMISErrorCodes)code
 {
     if (error == nil) {//shouldn't really get there
         return nil;
@@ -74,7 +74,7 @@ NSString * const kCMISErrorDescriptionVe
     return [NSError errorWithDomain:kCMISErrorDomainName code:code userInfo:errorInfo];
 }
 
-+ (NSError *)createCMISErrorWithCode:(CMISErrorCodes)code withDetailedDescription:(NSString *)detailedDescription
++ (NSError *)createCMISErrorWithCode:(CMISErrorCodes)code detailedDescription:(NSString *)detailedDescription
 {
     NSMutableDictionary *errorInfo = [NSMutableDictionary dictionary];
     [errorInfo setValue:[CMISErrors localizedDescriptionForCode:code] forKey:NSLocalizedDescriptionKey];

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISNetworkProvider.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISNetworkProvider.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISNetworkProvider.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISNetworkProvider.h Tue Feb 12 16:00:06 2013
@@ -43,8 +43,8 @@ typedef enum {
  * @param completionBlock returns an instance of the HTTPResponse if successful or nil otherwise
  */
 - (void)invoke:(NSURL *)url
-withHttpMethod:(CMISHttpRequestMethod)httpRequestMethod
-   withSession:(CMISBindingSession *)session
+    httpMethod:(CMISHttpRequestMethod)httpRequestMethod
+       session:(CMISBindingSession *)session
           body:(NSData *)body
        headers:(NSDictionary *)additionalHeaders
 completionBlock:(void (^)(CMISHttpResponse *httpResponse, NSError *error))completionBlock;
@@ -59,8 +59,8 @@ completionBlock:(void (^)(CMISHttpRespon
  * @param completionBlock returns an instance of the HTTPResponse if successful or nil otherwise
  */
 - (void)invoke:(NSURL *)url
-withHttpMethod:(CMISHttpRequestMethod)httpRequestMethod
-   withSession:(CMISBindingSession *)session
+    httpMethod:(CMISHttpRequestMethod)httpRequestMethod
+       session:(CMISBindingSession *)session
    inputStream:(NSInputStream *)inputStream
        headers:(NSDictionary *)additionalHeaders
 completionBlock:(void (^)(CMISHttpResponse *httpResponse, NSError *error))completionBlock;
@@ -78,8 +78,9 @@ completionBlock:(void (^)(CMISHttpRespon
  * @param progressBlock
  * @param requestObject a handle to the CMISRequest allowing this HTTP request to be cancelled
  */
-- (void)invoke:(NSURL *)url withHttpMethod:(CMISHttpRequestMethod)httpRequestMethod
-   withSession:(CMISBindingSession *)session
+- (void)invoke:(NSURL *)url
+    httpMethod:(CMISHttpRequestMethod)httpRequestMethod
+       session:(CMISBindingSession *)session
    inputStream:(NSInputStream *)inputStream
        headers:(NSDictionary *)additionalHeaders
  bytesExpected:(unsigned long long)bytesExpected
@@ -99,8 +100,8 @@ completionBlock:(void (^)(CMISHttpRespon
  * @param requestObject a handle to the CMISRequest allowing this HTTP request to be cancelled
  */
 - (void)invoke:(NSURL *)url
-withHttpMethod:(CMISHttpRequestMethod)httpRequestMethod
-   withSession:(CMISBindingSession *)session
+    httpMethod:(CMISHttpRequestMethod)httpRequestMethod
+       session:(CMISBindingSession *)session
   outputStream:(NSOutputStream *)outputStream
  bytesExpected:(unsigned long long)bytesExpected
 completionBlock:(void (^)(CMISHttpResponse *httpResponse, NSError *error))completionBlock
@@ -116,7 +117,7 @@ completionBlock:(void (^)(CMISHttpRespon
  * @param completionBlock returns an instance of the HTTPResponse if successful or nil otherwise
  */
 - (void)invokeGET:(NSURL *)url
-      withSession:(CMISBindingSession *)session
+          session:(CMISBindingSession *)session
   completionBlock:(void (^)(CMISHttpResponse *httpResponse, NSError *error))completionBlock;
 
 
@@ -129,7 +130,7 @@ completionBlock:(void (^)(CMISHttpRespon
  * @param completionBlock returns an instance of the HTTPResponse if successful or nil otherwise
  */
 - (void)invokePOST:(NSURL *)url
-       withSession:(CMISBindingSession *)session
+           session:(CMISBindingSession *)session
               body:(NSData *)body
            headers:(NSDictionary *)additionalHeaders
    completionBlock:(void (^)(CMISHttpResponse *httpResponse, NSError *error))completionBlock;
@@ -143,7 +144,7 @@ completionBlock:(void (^)(CMISHttpRespon
  * @param completionBlock returns an instance of the HTTPResponse if successful or nil otherwise
  */
 - (void)invokePUT:(NSURL *)url
-      withSession:(CMISBindingSession *)session
+          session:(CMISBindingSession *)session
              body:(NSData *)body
           headers:(NSDictionary *)additionalHeaders
   completionBlock:(void (^)(CMISHttpResponse *httpResponse, NSError *error))completionBlock;
@@ -155,7 +156,7 @@ completionBlock:(void (^)(CMISHttpRespon
  * @param completionBlock returns an instance of the HTTPResponse if successful or nil otherwise
  */
 - (void)invokeDELETE:(NSURL *)url
-         withSession:(CMISBindingSession *)session
+             session:(CMISBindingSession *)session
      completionBlock:(void (^)(CMISHttpResponse *httpResponse, NSError *error))completionBlock;
 
 



Mime
View raw message