chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pweschm...@apache.org
Subject svn commit: r1445217 [3/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/Common/CMISPropertyData.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISPropertyData.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISPropertyData.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISPropertyData.h Tue Feb 12 16:00:06 2013
@@ -56,38 +56,38 @@
 
 /** Creation of a multi-value property 
  */
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withArrayValue:(NSArray *)value type:(CMISPropertyType)type;
++ (CMISPropertyData *)createPropertyForId:(NSString *)id arrayValue:(NSArray *)value type:(CMISPropertyType)type;
 
 /** Creation of a string property 
  */
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withStringValue:(NSString *)value;
++ (CMISPropertyData *)createPropertyForId:(NSString *)id stringValue:(NSString *)value;
 
 /** Creation of an integer property 
  */
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withIntegerValue:(NSInteger)value;
++ (CMISPropertyData *)createPropertyForId:(NSString *)id integerValue:(NSInteger)value;
 
 /** Creation of a decimal property 
  */
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withDecimalValue:(NSNumber *)value;
++ (CMISPropertyData *)createPropertyForId:(NSString *)id decimalValue:(NSNumber *)value;
 
 /** Creation of an id property 
  */
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withIdValue:(NSString *)value;
++ (CMISPropertyData *)createPropertyForId:(NSString *)id idValue:(NSString *)value;
 
 /** Creation of a datetime property 
  */
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withDateTimeValue:(NSDate *)value;
++ (CMISPropertyData *)createPropertyForId:(NSString *)id dateTimeValue:(NSDate *)value;
 
 /** Creation of a boolean property 
  */
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withBoolValue:(BOOL)value;
++ (CMISPropertyData *)createPropertyForId:(NSString *)id boolValue:(BOOL)value;
 
 /** Creation of a uri property 
  */
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withUriValue:(NSURL *)value;
++ (CMISPropertyData *)createPropertyForId:(NSString *)id uriValue:(NSURL *)value;
 
 /** Creation of a uri property 
  */
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withHtmlValue:(NSString *)value;
++ (CMISPropertyData *)createPropertyForId:(NSString *)id htmlValue:(NSString *)value;
 
 @end

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISPropertyData.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISPropertyData.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISPropertyData.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISPropertyData.m Tue Feb 12 16:00:06 2013
@@ -110,47 +110,47 @@
     return propertyData;
 }
 
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withArrayValue:(NSArray *)value type:(CMISPropertyType)type
++ (CMISPropertyData *)createPropertyForId:(NSString *)id arrayValue:(NSArray *)value type:(CMISPropertyType)type
 {
     return [self createPropertyInternal:id value:value type:type];
 }
 
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withStringValue:(NSString *)value
++ (CMISPropertyData *)createPropertyForId:(NSString *)id stringValue:(NSString *)value
 {
     return [self createPropertyInternal:id value:value type:CMISPropertyTypeString];
 }
 
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withIntegerValue:(NSInteger)value
++ (CMISPropertyData *)createPropertyForId:(NSString *)id integerValue:(NSInteger)value
 {
     return [self createPropertyInternal:id value:[NSNumber numberWithInteger:value] type:CMISPropertyTypeInteger];
 }
 
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withDecimalValue:(NSNumber *)value
++ (CMISPropertyData *)createPropertyForId:(NSString *)id decimalValue:(NSNumber *)value
 {
     return [self createPropertyInternal:id value:value type:CMISPropertyTypeDecimal];
 }
 
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withIdValue:(NSString *)value
++ (CMISPropertyData *)createPropertyForId:(NSString *)id idValue:(NSString *)value
 {
     return [self createPropertyInternal:id value:value type:CMISPropertyTypeId];
 }
 
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withDateTimeValue:(NSDate *)value
++ (CMISPropertyData *)createPropertyForId:(NSString *)id dateTimeValue:(NSDate *)value
 {
     return [self createPropertyInternal:id value:value type:CMISPropertyTypeDateTime];
 }
 
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withBoolValue:(BOOL)value
++ (CMISPropertyData *)createPropertyForId:(NSString *)id boolValue:(BOOL)value
 {
     return [self createPropertyInternal:id value:[NSNumber numberWithBool:value] type:CMISPropertyTypeBoolean];
 }
 
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withUriValue:(NSURL *)value
++ (CMISPropertyData *)createPropertyForId:(NSString *)id uriValue:(NSURL *)value
 {
     return [self createPropertyInternal:id value:value type:CMISPropertyTypeUri];
 }
 
-+ (CMISPropertyData *)createPropertyForId:(NSString *)id withHtmlValue:(NSString *)value
++ (CMISPropertyData *)createPropertyForId:(NSString *)id htmlValue:(NSString *)value
 {
     return [self createPropertyInternal:id value:value type:CMISPropertyTypeHtml];
 }

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISSessionParameters.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISSessionParameters.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISSessionParameters.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISSessionParameters.h Tue Feb 12 16:00:06 2013
@@ -69,7 +69,7 @@ extern NSString * const kCMISSessionPara
 
 - (id)objectForKey:(id)key;
 
-- (id)objectForKey:(id)key withDefaultValue:(id)defaultValue;
+- (id)objectForKey:(id)key defaultValue:(id)defaultValue;
 
 - (void)setObject:(id)object forKey:(id)key;
 

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISSessionParameters.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISSessionParameters.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISSessionParameters.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISSessionParameters.m Tue Feb 12 16:00:06 2013
@@ -64,7 +64,7 @@ NSString * const kCMISSessionParameterMo
     return [self.sessionData objectForKey:key];
 }
 
-- (id)objectForKey:(id)key withDefaultValue:(id)defaultValue
+- (id)objectForKey:(id)key defaultValue:(id)defaultValue
 {
     NSObject *value = [self.sessionData objectForKey:key];
     return value != nil ? value : defaultValue;

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISStandardAuthenticationProvider.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISStandardAuthenticationProvider.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISStandardAuthenticationProvider.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISStandardAuthenticationProvider.h Tue Feb 12 16:00:06 2013
@@ -28,7 +28,7 @@
  * @param username
  * @param password
  */
-- (id)initWithUsername:(NSString *)username andPassword:(NSString *)password;
+- (id)initWithUsername:(NSString *)username password:(NSString *)password;
 
 /** Initialize with a credential object that will be provided when a corresponding challenge is received from the server.
  * Both client certificate and username / password credentials are supported

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISStandardAuthenticationProvider.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISStandardAuthenticationProvider.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISStandardAuthenticationProvider.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Common/CMISStandardAuthenticationProvider.m Tue Feb 12 16:00:06 2013
@@ -28,7 +28,7 @@
 @implementation CMISStandardAuthenticationProvider
 
 
-- (id)initWithUsername:(NSString *)username andPassword:(NSString *)password
+- (id)initWithUsername:(NSString *)username password:(NSString *)password
 {
     self = [super init];
     if (self) {

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISBase64Encoder.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISBase64Encoder.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISBase64Encoder.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISBase64Encoder.h Tue Feb 12 16:00:06 2013
@@ -34,9 +34,9 @@
 + (NSString *)encodeContentFromInputStream:(NSInputStream*)inputStream;
 
 /// base64 encodes data from a source file and appends the encoded result to the given destination file
-+ (void)encodeContentOfFile:(NSString *)sourceFilePath andAppendToFile:(NSString *)destinationFilePath;
++ (void)encodeContentOfFile:(NSString *)sourceFilePath appendToFile:(NSString *)destinationFilePath;
 
 /// base64 encodes data from an input stream and appends the encoded data to a given destination file
-+ (void)encodeContentFromInputStream:(NSInputStream*)inputStream andAppendToFile:(NSString *)destinationFilePath;
++ (void)encodeContentFromInputStream:(NSInputStream*)inputStream appendToFile:(NSString *)destinationFilePath;
 
 @end

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISBase64Encoder.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISBase64Encoder.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISBase64Encoder.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISBase64Encoder.m Tue Feb 12 16:00:06 2013
@@ -115,7 +115,7 @@ static char *alphabet = "ABCDEFGHIJKLMNO
 }
 
 
-+ (void)encodeContentOfFile:(NSString *)sourceFilePath andAppendToFile:(NSString *)destinationFilePath
++ (void)encodeContentOfFile:(NSString *)sourceFilePath appendToFile:(NSString *)destinationFilePath
 {
     NSFileHandle *fileHandle = [NSFileHandle fileHandleForReadingAtPath:sourceFilePath];
     if (fileHandle) {
@@ -143,7 +143,7 @@ static char *alphabet = "ABCDEFGHIJKLMNO
     }
 }
 
-+ (void)encodeContentFromInputStream:(NSInputStream*)inputStream andAppendToFile:(NSString *)destinationFilePath
++ (void)encodeContentFromInputStream:(NSInputStream*)inputStream appendToFile:(NSString *)destinationFilePath
 {
     [inputStream open];
     

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISDefaultNetworkProvider.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISDefaultNetworkProvider.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISDefaultNetworkProvider.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISDefaultNetworkProvider.m Tue Feb 12 16:00:06 2013
@@ -24,8 +24,8 @@
 
 @interface CMISDefaultNetworkProvider ()
 + (NSMutableURLRequest *)createRequestForUrl:(NSURL *)url
-                              withHttpMethod:(CMISHttpRequestMethod)httpRequestMethod
-                                usingSession:(CMISBindingSession *)session;
+                                  httpMethod:(CMISHttpRequestMethod)httpRequestMethod
+                                     session:(CMISBindingSession *)session;
 @end
 
 @implementation CMISDefaultNetworkProvider
@@ -33,18 +33,18 @@
 
 
 - (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
 {
     NSMutableURLRequest *urlRequest = [CMISDefaultNetworkProvider createRequestForUrl:url
-                                                     withHttpMethod:httpRequestMethod
-                                                       usingSession:session];
+                                                                           httpMethod:httpRequestMethod
+                                                                              session:session];
     
     [CMISHttpRequest startRequest:urlRequest
-                   withHttpMethod:httpRequestMethod
+                       httpMethod:httpRequestMethod
                       requestBody:body
                           headers:additionalHeaders
            authenticationProvider:session.authenticationProvider
@@ -52,18 +52,18 @@ completionBlock:(void (^)(CMISHttpRespon
 }
 
 - (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
 {
     NSMutableURLRequest *urlRequest = [CMISDefaultNetworkProvider createRequestForUrl:url
-                                                     withHttpMethod:httpRequestMethod
-                                                       usingSession:session];
+                                                                           httpMethod:httpRequestMethod
+                                                                              session:session];
     
     [CMISHttpUploadRequest startRequest:urlRequest
-                         withHttpMethod:httpRequestMethod
+                             httpMethod:httpRequestMethod
                             inputStream:inputStream
                                 headers:additionalHeaders
                           bytesExpected:0
@@ -73,8 +73,8 @@ completionBlock:(void (^)(CMISHttpRespon
 }
 
 - (void)invoke:(NSURL *)url
-withHttpMethod:(CMISHttpRequestMethod)httpRequestMethod
-   withSession:(CMISBindingSession *)session
+    httpMethod:(CMISHttpRequestMethod)httpRequestMethod
+       session:(CMISBindingSession *)session
    inputStream:(NSInputStream *)inputStream
        headers:(NSDictionary *)additionalHeaders
  bytesExpected:(unsigned long long)bytesExpected
@@ -84,11 +84,11 @@ completionBlock:(void (^)(CMISHttpRespon
 {
     if (!requestObject.isCancelled) {
         NSMutableURLRequest *urlRequest = [CMISDefaultNetworkProvider createRequestForUrl:url
-                                                         withHttpMethod:httpRequestMethod
-                                                           usingSession:session];
+                                                                               httpMethod:httpRequestMethod
+                                                                                  session:session];
         
         CMISHttpUploadRequest *uploadRequest = [CMISHttpUploadRequest startRequest:urlRequest
-                                                                    withHttpMethod:httpRequestMethod
+                                                                        httpMethod:httpRequestMethod
                                                                        inputStream:inputStream
                                                                            headers:additionalHeaders
                                                                      bytesExpected:bytesExpected
@@ -99,14 +99,14 @@ completionBlock:(void (^)(CMISHttpRespon
     } else {
         if (completionBlock) {
             completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeCancelled
-                                             withDetailedDescription:@"Request was cancelled"]);
+                                                 detailedDescription:@"Request was 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
@@ -115,11 +115,11 @@ completionBlock:(void (^)(CMISHttpRespon
 {
     if (!requestObject.isCancelled) {
         NSMutableURLRequest *urlRequest = [CMISDefaultNetworkProvider createRequestForUrl:url
-                                                         withHttpMethod:HTTP_GET
-                                                           usingSession:session];
+                                                                               httpMethod:HTTP_GET
+                                                                                  session:session];
         
         CMISHttpDownloadRequest *downloadRequest = [CMISHttpDownloadRequest startRequest:urlRequest
-                                                                          withHttpMethod:httpRequestMethod
+                                                                              httpMethod:httpRequestMethod
                                                                             outputStream:outputStream
                                                                            bytesExpected:bytesExpected
                                                                   authenticationProvider:session.authenticationProvider
@@ -129,59 +129,59 @@ completionBlock:(void (^)(CMISHttpRespon
     } else {
         if (completionBlock) {
             completionBlock(nil, [CMISErrors createCMISErrorWithCode:kCMISErrorCodeCancelled
-                                             withDetailedDescription:@"Request was cancelled"]);
+                                                 detailedDescription:@"Request was cancelled"]);
             
         }
     }
 }
 
 - (void)invokeGET:(NSURL *)url
-      withSession:(CMISBindingSession *)session
+          session:(CMISBindingSession *)session
   completionBlock:(void (^)(CMISHttpResponse *httpResponse, NSError *error))completionBlock
 {
     return [self invoke:url
-         withHttpMethod:HTTP_GET
-            withSession:session
+             httpMethod:HTTP_GET
+                session:session
                    body:nil
                 headers:nil
         completionBlock:completionBlock];
 }
 
 - (void)invokePOST:(NSURL *)url
-       withSession:(CMISBindingSession *)session
+           session:(CMISBindingSession *)session
               body:(NSData *)body
            headers:(NSDictionary *)additionalHeaders
    completionBlock:(void (^)(CMISHttpResponse *httpResponse, NSError *error))completionBlock
 {
     return [self invoke:url
-         withHttpMethod:HTTP_POST
-            withSession:session
+             httpMethod:HTTP_POST
+                session:session
                    body:body
                 headers:additionalHeaders
         completionBlock:completionBlock];
 }
 
 - (void)invokePUT:(NSURL *)url
-      withSession:(CMISBindingSession *)session
+          session:(CMISBindingSession *)session
              body:(NSData *)body
           headers:(NSDictionary *)additionalHeaders
   completionBlock:(void (^)(CMISHttpResponse *httpResponse, NSError *error))completionBlock
 {
     return [self invoke:url
-         withHttpMethod:HTTP_PUT
-            withSession:session
+             httpMethod:HTTP_PUT
+                session:session
                    body:body
                 headers:additionalHeaders
         completionBlock:completionBlock];
 }
 
 - (void)invokeDELETE:(NSURL *)url
-         withSession:(CMISBindingSession *)session
+             session:(CMISBindingSession *)session
      completionBlock:(void (^)(CMISHttpResponse *httpResponse, NSError *error))completionBlock
 {
     return [self invoke:url
-         withHttpMethod:HTTP_DELETE
-            withSession:session
+             httpMethod:HTTP_DELETE
+                session:session
                    body:nil
                 headers:nil
         completionBlock:completionBlock];
@@ -189,8 +189,8 @@ completionBlock:(void (^)(CMISHttpRespon
 
 #pragma mark Helper methods
 + (NSMutableURLRequest *)createRequestForUrl:(NSURL *)url
-                              withHttpMethod:(CMISHttpRequestMethod)httpRequestMethod
-                                usingSession:(CMISBindingSession *)session
+                                  httpMethod:(CMISHttpRequestMethod)httpRequestMethod
+                                     session:(CMISBindingSession *)session
 {
     NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url
                                                            cachePolicy:NSURLRequestReloadIgnoringCacheData

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpDownloadRequest.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpDownloadRequest.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpDownloadRequest.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpDownloadRequest.h Tue Feb 12 16:00:06 2013
@@ -34,7 +34,7 @@
  * completionBlock returns a CMISHttpResponse object or nil if unsuccessful
  */
 + (CMISHttpDownloadRequest*)startRequest:(NSMutableURLRequest*)urlRequest
-                          withHttpMethod:(CMISHttpRequestMethod)httpRequestMethod
+                              httpMethod:(CMISHttpRequestMethod)httpRequestMethod
                             outputStream:(NSOutputStream*)outputStream
                            bytesExpected:(unsigned long long)bytesExpected
                   authenticationProvider:(id<CMISAuthenticationProvider>) authenticationProvider

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpDownloadRequest.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpDownloadRequest.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpDownloadRequest.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpDownloadRequest.m Tue Feb 12 16:00:06 2013
@@ -32,7 +32,7 @@
 
 
 + (CMISHttpDownloadRequest*)startRequest:(NSMutableURLRequest *)urlRequest
-                          withHttpMethod:(CMISHttpRequestMethod)httpRequestMethod
+                              httpMethod:(CMISHttpRequestMethod)httpRequestMethod
                             outputStream:(NSOutputStream*)outputStream
                            bytesExpected:(unsigned long long)bytesExpected
                   authenticationProvider:(id<CMISAuthenticationProvider>) authenticationProvider
@@ -102,7 +102,7 @@
             if (self.completionBlock)
             {
                 NSError *cmisError = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeStorage
-                                                 withDetailedDescription:@"Could not open output stream"];
+                                                     detailedDescription:@"Could not open output stream"];
                 self.completionBlock(nil, cmisError);
             }
         }

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpRequest.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpRequest.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpRequest.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpRequest.h Tue Feb 12 16:00:06 2013
@@ -42,11 +42,11 @@
  * completionBlock returns a CMISHTTPResponse object or nil if unsuccessful
  */
 + (CMISHttpRequest*)startRequest:(NSMutableURLRequest *)urlRequest
-              withHttpMethod:(CMISHttpRequestMethod)httpRequestMethod
-                 requestBody:(NSData*)requestBody
-                     headers:(NSDictionary*)additionalHeaders
-      authenticationProvider:(id<CMISAuthenticationProvider>)authenticationProvider
-             completionBlock:(void (^)(CMISHttpResponse *httpResponse, NSError *error))completionBlock;
+                      httpMethod:(CMISHttpRequestMethod)httpRequestMethod
+                     requestBody:(NSData*)requestBody
+                         headers:(NSDictionary*)additionalHeaders
+          authenticationProvider:(id<CMISAuthenticationProvider>)authenticationProvider
+                 completionBlock:(void (^)(CMISHttpResponse *httpResponse, NSError *error))completionBlock;
 
 /**
  * designated initialiser. Do not use this initialiser directly. Instead use the

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpRequest.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpRequest.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpRequest.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpRequest.m Tue Feb 12 16:00:06 2013
@@ -42,7 +42,7 @@ NSString * const kCMISExceptionVersionin
 
 
 + (CMISHttpRequest*)startRequest:(NSMutableURLRequest *)urlRequest
-                  withHttpMethod:(CMISHttpRequestMethod)httpRequestMethod
+                      httpMethod:(CMISHttpRequestMethod)httpRequestMethod
                      requestBody:(NSData*)requestBody
                          headers:(NSDictionary*)additionalHeaders
           authenticationProvider:(id<CMISAuthenticationProvider>) authenticationProvider
@@ -94,7 +94,7 @@ NSString * const kCMISExceptionVersionin
     } else {
         if (self.completionBlock) {
             NSString *detailedDescription = [NSString stringWithFormat:@"Could not create connection to %@", urlRequest.URL];
-            NSError *cmisError = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeConnection withDetailedDescription:detailedDescription];
+            NSError *cmisError = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeConnection detailedDescription:detailedDescription];
             self.completionBlock(nil, cmisError);
         }
         return NO;
@@ -113,7 +113,7 @@ NSString * const kCMISExceptionVersionin
         
         self.connection = nil;
         
-        NSError *cmisError = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeCancelled withDetailedDescription:@"Request was cancelled"];
+        NSError *cmisError = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeCancelled detailedDescription:@"Request was cancelled"];
         completionBlock(nil, cmisError);
     }
 }
@@ -158,7 +158,7 @@ NSString * const kCMISExceptionVersionin
 
     if (self.completionBlock) {
         CMISErrorCodes cmisErrorCode = (error.code == NSURLErrorCancelled) ? kCMISErrorCodeCancelled : kCMISErrorCodeConnection;
-        NSError *cmisError = [CMISErrors cmisError:error withCMISErrorCode:cmisErrorCode];
+        NSError *cmisError = [CMISErrors cmisError:error cmisErrorCode:cmisErrorCode];
         self.completionBlock(nil, cmisError);
     }
     
@@ -174,8 +174,8 @@ NSString * const kCMISExceptionVersionin
     
     if (self.completionBlock) {
         NSError *cmisError = nil;
-        CMISHttpResponse *httpResponse = [CMISHttpResponse responseUsingURLHTTPResponse:self.response andData:self.responseBody];
-        if ([self checkStatusCodeForResponse:httpResponse withHttpRequestMethod:self.requestMethod error:&cmisError]) {
+        CMISHttpResponse *httpResponse = [CMISHttpResponse responseUsingURLHTTPResponse:self.response data:self.responseBody];
+        if ([self checkStatusCodeForResponse:httpResponse httpRequestMethod:self.requestMethod error:&cmisError]) {
             self.completionBlock(httpResponse, nil);
         } else {
             self.completionBlock(nil, cmisError);
@@ -187,7 +187,7 @@ NSString * const kCMISExceptionVersionin
     self.connection = nil;
 }
 
-- (BOOL)checkStatusCodeForResponse:(CMISHttpResponse *)response withHttpRequestMethod:(CMISHttpRequestMethod)httpRequestMethod error:(NSError **)error
+- (BOOL)checkStatusCodeForResponse:(CMISHttpResponse *)response httpRequestMethod:(CMISHttpRequestMethod)httpRequestMethod error:(NSError **)error
 {
     if ( (httpRequestMethod == HTTP_GET && response.statusCode != 200)
         || (httpRequestMethod == HTTP_POST && response.statusCode != 201)
@@ -206,62 +206,62 @@ NSString * const kCMISExceptionVersionin
                 case 400:
                     if ([exception isEqualToString:kCMISExceptionFilterNotValid]) {
                         *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeFilterNotValid
-                                             withDetailedDescription:errorMessage];
+                                                 detailedDescription:errorMessage];
                     } else {
                         *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument
-                                             withDetailedDescription:errorMessage];
+                                                 detailedDescription:errorMessage];
                     }
                     break;
                 case 401:
                     *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeUnauthorized
-                                         withDetailedDescription:errorMessage];
+                                             detailedDescription:errorMessage];
                     break;
                 case 403:
                     if ([exception isEqualToString:kCMISExceptionStreamNotSupported]) {
                         *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeStreamNotSupported
-                                             withDetailedDescription:errorMessage];
+                                                 detailedDescription:errorMessage];
                     } else {
                         *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodePermissionDenied
-                                             withDetailedDescription:errorMessage];
+                                                 detailedDescription:errorMessage];
                     }
                     break;
                 case 404:
                     *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeObjectNotFound
-                                         withDetailedDescription:errorMessage];
+                                             detailedDescription:errorMessage];
                     break;
                 case 405:
                     *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeNotSupported
-                                         withDetailedDescription:errorMessage];
+                                             detailedDescription:errorMessage];
                     break;
                 case 407:
                     *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeProxyAuthentication
-                                         withDetailedDescription:errorMessage];
+                                             detailedDescription:errorMessage];
                     break;
                 case 409:
                     if ([exception isEqualToString:kCMISExceptionContentAlreadyExists]) {
                         *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeContentAlreadyExists
-                                             withDetailedDescription:errorMessage];
+                                                 detailedDescription:errorMessage];
                     } else if ([exception isEqualToString:kCMISExceptionVersioning]) {
                         *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeVersioning
-                                             withDetailedDescription:errorMessage];
+                                                 detailedDescription:errorMessage];
                     } else if ([exception isEqualToString:kCMISExceptionUpdateConflict]) {
                         *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeUpdateConflict
-                                             withDetailedDescription:errorMessage];
+                                                 detailedDescription:errorMessage];
                     } else if ([exception isEqualToString:kCMISExceptionNameConstraintViolation]) {
                         *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeNameConstraintViolation
-                                             withDetailedDescription:errorMessage];
+                                                 detailedDescription:errorMessage];
                     } else {
                         *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeConstraint
-                                             withDetailedDescription:errorMessage];
+                                                 detailedDescription:errorMessage];
                     }
                     break;
                 default:
                     if ([exception isEqualToString:kCMISExceptionStorage]) {
                         *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeStorage
-                                             withDetailedDescription:errorMessage];
+                                                 detailedDescription:errorMessage];
                     } else {
                         *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeRuntime
-                                             withDetailedDescription:response.errorMessage];
+                                                 detailedDescription:response.errorMessage];
                     }
             }
         }

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.h Tue Feb 12 16:00:06 2013
@@ -26,7 +26,8 @@
 @property (nonatomic, strong, readonly) NSData *data;
 
 /// wrapper for returned NSHTTPURLResponse and retrieved data
-+ (CMISHttpResponse *)responseUsingURLHTTPResponse:(NSHTTPURLResponse *)HTTPURLResponse andData:(NSData *)data;
++ (CMISHttpResponse *)responseUsingURLHTTPResponse:(NSHTTPURLResponse *)HTTPURLResponse
+                                              data:(NSData *)data;
 
 /// returns a CMISHttpResponse object with HTTP status code, message headers and any response data
 + (CMISHttpResponse *)responseWithStatusCode:(int)statusCode

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpResponse.m Tue Feb 12 16:00:06 2013
@@ -30,7 +30,8 @@
 @implementation CMISHttpResponse
 
 
-+ (CMISHttpResponse *)responseUsingURLHTTPResponse:(NSHTTPURLResponse *)httpUrlResponse andData:(NSData *)data
++ (CMISHttpResponse *)responseUsingURLHTTPResponse:(NSHTTPURLResponse *)httpUrlResponse
+                                              data:(NSData *)data
 {
     CMISHttpResponse *httpResponse = [[CMISHttpResponse alloc] init];
     httpResponse.statusCode = httpUrlResponse.statusCode;

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpUploadRequest.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpUploadRequest.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpUploadRequest.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpUploadRequest.h Tue Feb 12 16:00:06 2013
@@ -31,7 +31,7 @@
  * completionBlock returns CMISHttpResponse instance or nil if unsuccessful
  */
 + (CMISHttpUploadRequest*)startRequest:(NSMutableURLRequest *)urlRequest
-                        withHttpMethod:(CMISHttpRequestMethod)httpRequestMethod
+                            httpMethod:(CMISHttpRequestMethod)httpRequestMethod
                            inputStream:(NSInputStream*)inputStream
                                headers:(NSDictionary*)addionalHeaders
                          bytesExpected:(unsigned long long)bytesExpected

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpUploadRequest.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpUploadRequest.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpUploadRequest.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISHttpUploadRequest.m Tue Feb 12 16:00:06 2013
@@ -31,7 +31,7 @@
 
 
 + (CMISHttpUploadRequest*)startRequest:(NSMutableURLRequest *)urlRequest
-                        withHttpMethod:(CMISHttpRequestMethod)httpRequestMethod
+                            httpMethod:(CMISHttpRequestMethod)httpRequestMethod
                            inputStream:(NSInputStream*)inputStream
                                headers:(NSDictionary*)additionalHeaders
                          bytesExpected:(unsigned long long)bytesExpected

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISObjectConverter.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISObjectConverter.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISObjectConverter.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISObjectConverter.m Tue Feb 12 16:00:06 2013
@@ -50,9 +50,9 @@
     CMISObject *object = nil;
     
     if (objectData.baseType == CMISBaseTypeDocument) {
-        object = [[CMISDocument alloc] initWithObjectData:objectData withSession:self.session];
+        object = [[CMISDocument alloc] initWithObjectData:objectData session:self.session];
     } else if (objectData.baseType == CMISBaseTypeFolder) {
-        object = [[CMISFolder alloc] initWithObjectData:objectData withSession:self.session];
+        object = [[CMISFolder alloc] initWithObjectData:objectData session:self.session];
     }
     
     return object;
@@ -97,7 +97,7 @@
             
             if (propertyDefinition == nil) {
                 NSError *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument
-                                             withDetailedDescription:[NSString stringWithFormat:@"Invalid property '%@' for this object type", propertyId]];
+                                                 detailedDescription:[NSString stringWithFormat:@"Invalid property '%@' for this object type", propertyId]];
                 completionBlock(nil, error);
                 return;
             }
@@ -109,7 +109,7 @@
                 case(CMISPropertyTypeString): {
                     expectedType = [NSString class];
                     if ([propertyValue isKindOfClass:expectedType]) {
-                        [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId withStringValue:propertyValue]];
+                        [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId stringValue:propertyValue]];
                     } else if ([propertyValue isKindOfClass:[NSArray class]]) {
                         for (id propertyValueItemValue in propertyValue) {
                             if (![propertyValueItemValue isKindOfClass:expectedType]) {
@@ -118,7 +118,7 @@
                             }
                         }
                         if (validType) {
-                            [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId withArrayValue:propertyValue type:propertyDefinition.propertyType]];
+                            [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId arrayValue:propertyValue type:propertyDefinition.propertyType]];
                         }
                     } else {
                         validType = NO;
@@ -129,7 +129,7 @@
                     expectedType = [NSNumber class];
                     if ([propertyValue isKindOfClass:expectedType]) {
                         BOOL boolValue = ((NSNumber *) propertyValue).boolValue;
-                        [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId withBoolValue:boolValue]];
+                        [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId boolValue:boolValue]];
                     } else if ([propertyValue isKindOfClass:[NSArray class]]) {
                         for (id propertyValueItemValue in propertyValue) {
                             if (![propertyValueItemValue isKindOfClass:expectedType]) {
@@ -138,7 +138,7 @@
                             }
                         }
                         if (validType) {
-                            [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId withArrayValue:propertyValue type:propertyDefinition.propertyType]];
+                            [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId arrayValue:propertyValue type:propertyDefinition.propertyType]];
                         }
                     } else {
                         validType = NO;
@@ -149,7 +149,7 @@
                     expectedType = [NSNumber class];
                     if ([propertyValue isKindOfClass:expectedType]) {
                         NSInteger intValue = ((NSNumber *) propertyValue).integerValue;
-                        [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId withIntegerValue:intValue]];
+                        [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId integerValue:intValue]];
                     } else if ([propertyValue isKindOfClass:[NSArray class]]) {
                         for (id propertyValueItemValue in propertyValue) {
                             if (![propertyValueItemValue isKindOfClass:expectedType]) {
@@ -158,7 +158,7 @@
                             }
                         }
                         if (validType) {
-                            [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId withArrayValue:propertyValue type:propertyDefinition.propertyType]];
+                            [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId arrayValue:propertyValue type:propertyDefinition.propertyType]];
                         }
                     } else {
                         validType = NO;
@@ -168,7 +168,7 @@
                 case(CMISPropertyTypeDecimal): {
                     expectedType = [NSNumber class];
                     if ([propertyValue isKindOfClass:expectedType]) {
-                        [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId withDecimalValue:propertyValue]];
+                        [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId decimalValue:propertyValue]];
                     } else if ([propertyValue isKindOfClass:[NSArray class]]) {
                         for (id propertyValueItemValue in propertyValue) {
                             if (![propertyValueItemValue isKindOfClass:expectedType]) {
@@ -177,7 +177,7 @@
                             }
                         }
                         if (validType) {
-                            [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId withArrayValue:propertyValue type:propertyDefinition.propertyType]];
+                            [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId arrayValue:propertyValue type:propertyDefinition.propertyType]];
                         }
                     } else {
                         validType = NO;
@@ -187,7 +187,7 @@
                 case(CMISPropertyTypeId): {
                     expectedType = [NSString class];
                     if ([propertyValue isKindOfClass:expectedType]) {
-                        [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId withIdValue:propertyValue]];
+                        [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId idValue:propertyValue]];
                     } else if ([propertyValue isKindOfClass:[NSArray class]]) {
                         for (id propertyValueItemValue in propertyValue) {
                             if (![propertyValueItemValue isKindOfClass:expectedType]) {
@@ -196,7 +196,7 @@
                             }
                         }
                         if (validType) {
-                            [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId withArrayValue:propertyValue type:propertyDefinition.propertyType]];
+                            [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId arrayValue:propertyValue type:propertyDefinition.propertyType]];
                         }
                     } else {
                         validType = NO;
@@ -209,7 +209,7 @@
                     }
                     expectedType = [NSDate class];
                     if ([propertyValue isKindOfClass:expectedType]) {
-                        [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId withDateTimeValue:propertyValue]];
+                        [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId dateTimeValue:propertyValue]];
                     } else if ([propertyValue isKindOfClass:[NSArray class]]) {
                         for (__strong id propertyValueItemValue in propertyValue) {
                             if ([propertyValueItemValue isKindOfClass:[NSString class]]) {
@@ -221,7 +221,7 @@
                             }
                         }
                         if (validType) {
-                            [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId withArrayValue:propertyValue type:propertyDefinition.propertyType]];
+                            [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId arrayValue:propertyValue type:propertyDefinition.propertyType]];
                         }
                     } else {
                         validType = NO;
@@ -234,7 +234,7 @@
                     }
                     expectedType = [NSURL class];
                     if ([propertyValue isKindOfClass:expectedType]) {
-                        [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId withUriValue:propertyValue]];
+                        [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId uriValue:propertyValue]];
                     } else if ([propertyValue isKindOfClass:[NSArray class]]) {
                         for (__strong id propertyValueItemValue in propertyValue) {
                             if ([propertyValueItemValue isKindOfClass:[NSString class]]) {
@@ -246,7 +246,7 @@
                             }
                         }
                         if (validType) {
-                            [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId withArrayValue:propertyValue type:propertyDefinition.propertyType]];
+                            [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId arrayValue:propertyValue type:propertyDefinition.propertyType]];
                         }
                     } else {
                         validType = NO;
@@ -256,7 +256,7 @@
                 case(CMISPropertyTypeHtml): {
                     expectedType = [NSString class];
                     if ([propertyValue isKindOfClass:expectedType]) {
-                        [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId withHtmlValue:propertyValue]];
+                        [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId htmlValue:propertyValue]];
                     } else if ([propertyValue isKindOfClass:[NSArray class]]) {
                         for (id propertyValueItemValue in propertyValue) {
                             if (![propertyValueItemValue isKindOfClass:expectedType]) {
@@ -265,7 +265,7 @@
                             }
                         }
                         if (validType) {
-                            [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId withArrayValue:propertyValue type:propertyDefinition.propertyType]];
+                            [convertedProperties addProperty:[CMISPropertyData createPropertyForId:propertyId arrayValue:propertyValue type:propertyDefinition.propertyType]];
                         }
                     } else {
                         validType = NO;
@@ -274,7 +274,7 @@
                 }
                 default: {
                     NSError *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument
-                                                 withDetailedDescription:[NSString stringWithFormat:@"Unsupported: cannot convert property type %d", propertyDefinition.propertyType]];
+                                                 detailedDescription:[NSString stringWithFormat:@"Unsupported: cannot convert property type %d", propertyDefinition.propertyType]];
                     completionBlock(nil, error);
                     return;
                 }
@@ -282,7 +282,7 @@
             
             if (!validType) {
                 NSError *error = [CMISErrors createCMISErrorWithCode:kCMISErrorCodeInvalidArgument
-                                             withDetailedDescription:[NSString stringWithFormat:@"Property value for %@ should be of type '%@'", propertyId, expectedType]];
+                                             detailedDescription:[NSString stringWithFormat:@"Property value for %@ should be of type '%@'", propertyId, expectedType]];
                 completionBlock(nil, error);
                 return;
             }
@@ -332,7 +332,7 @@
          retrieveTypeDefinition:objectTypeId
          completionBlock:^(CMISTypeDefinition *typeDefinition, NSError *error) {
              if (error) {
-                 completionBlock(nil, [CMISErrors cmisError:error withCMISErrorCode:kCMISErrorCodeRuntime]);
+                 completionBlock(nil, [CMISErrors cmisError:error cmisErrorCode:kCMISErrorCodeRuntime]);
              } else {
                  [self internalNormalConvertProperties:properties
                                         typeDefinition:typeDefinition

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISURLUtil.h
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISURLUtil.h?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISURLUtil.h (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISURLUtil.h Tue Feb 12 16:00:06 2013
@@ -22,8 +22,8 @@
 
 @interface CMISURLUtil : NSObject
 /// utility method to obtain a URL string
-+ (NSString *)urlStringByAppendingParameter:(NSString *)parameterName withValue:(NSString *)parameterValue toUrlString:(NSString *)urlString;
++ (NSString *)urlStringByAppendingParameter:(NSString *)parameterName value:(NSString *)parameterValue urlString:(NSString *)urlString;
 /// utility method to obtain a URL string
-+ (NSURL *)urlStringByAppendingParameter:(NSString *)parameterName withValue:(NSString *)parameterValue toUrl:(NSURL *)url;
++ (NSURL *)urlStringByAppendingParameter:(NSString *)parameterName value:(NSString *)parameterValue url:(NSURL *)url;
 
 @end
\ No newline at end of file

Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISURLUtil.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISURLUtil.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISURLUtil.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS/Utils/CMISURLUtil.m Tue Feb 12 16:00:06 2013
@@ -23,7 +23,7 @@
 
 @implementation CMISURLUtil
 
-+ (NSString *)urlStringByAppendingParameter:(NSString *)parameterName withValue:(NSString *)parameterValue toUrlString:(NSString *)urlString
++ (NSString *)urlStringByAppendingParameter:(NSString *)parameterName value:(NSString *)parameterValue urlString:(NSString *)urlString
 {
     if (parameterName == nil || parameterValue == nil) {
         return urlString;
@@ -46,9 +46,9 @@
     return result;
 }
 
-+ (NSURL *)urlStringByAppendingParameter:(NSString *)parameterName withValue:(NSString *)parameterValue toUrl:(NSURL *)url
++ (NSURL *)urlStringByAppendingParameter:(NSString *)parameterName value:(NSString *)parameterValue url:(NSURL *)url
 {
-    return [NSURL URLWithString:[CMISURLUtil urlStringByAppendingParameter:parameterName withValue:parameterValue toUrlString:[url absoluteString]]];
+    return [NSURL URLWithString:[CMISURLUtil urlStringByAppendingParameter:parameterName value:parameterValue urlString:[url absoluteString]]];
 }
 
 @end
\ No newline at end of file

Modified: chemistry/objectivecmis/trunk/ObjectiveCMISTests/CMISBaseTest.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMISTests/CMISBaseTest.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMISTests/CMISBaseTest.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMISTests/CMISBaseTest.m Tue Feb 12 16:00:06 2013
@@ -139,10 +139,9 @@
     __block long long previousUploadedBytes = -1;
     __block NSString *objectId = nil;
     [self.rootFolder createDocumentFromFilePath:filePath
-            withMimeType:@"text/plain"
-            withProperties:documentProperties
-            completionBlock: ^ (NSString *newObjectId, NSError *error)
-            {
+                                       mimeType:@"text/plain"
+                                     properties:documentProperties
+                                completionBlock: ^ (NSString *newObjectId, NSError *error){
                 if (newObjectId) {
                     objectId = newObjectId;
                     

Modified: chemistry/objectivecmis/trunk/ObjectiveCMISTests/ObjectiveCMISTests.m
URL: http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMISTests/ObjectiveCMISTests.m?rev=1445217&r1=1445216&r2=1445217&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMISTests/ObjectiveCMISTests.m (original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMISTests/ObjectiveCMISTests.m Tue Feb 12 16:00:06 2013
@@ -351,8 +351,8 @@
 
         __block long long previousBytesUploaded = -1;
         [self.rootFolder createDocumentFromFilePath:filePath
-                                       withMimeType:@"text/plain"
-                                     withProperties:documentProperties
+                                           mimeType:@"text/plain"
+                                         properties:documentProperties
                                     completionBlock:^ (NSString *objectId, NSError *error) {
                  if (objectId) {
                      STAssertNotNil(objectId, @"Object id received should be non-nil");
@@ -400,10 +400,10 @@
         __block long long previousUploadedBytes = -1;
         __block NSString *objectId = nil;
         [self.session createDocumentFromFilePath:filePath
-                withMimeType:@"text/plain"
-                withProperties:documentProperties
-                inFolder:self.rootFolder.identifier
-                completionBlock: ^ (NSString *newObjectId, NSError *error) {
+                                        mimeType:@"text/plain"
+                                      properties:documentProperties
+                                        inFolder:self.rootFolder.identifier
+                                 completionBlock: ^ (NSString *newObjectId, NSError *error) {
                     if (newObjectId) {
                         objectId = newObjectId;
                    
@@ -450,8 +450,8 @@
         __block long long previousBytesUploaded = -1;
         __block NSString *objectId;
         [self.rootFolder createDocumentFromFilePath:fileToUploadPath
-                                       withMimeType:@"application/pdf"
-                                     withProperties:documentProperties
+                                           mimeType:@"application/pdf"
+                                         properties:documentProperties
                                     completionBlock:^(NSString *newObjectId, NSError *error) {
                    if (newObjectId) {
                        NSLog(@"File upload completed");
@@ -532,7 +532,10 @@
                 CMISFolder *newFolder = (CMISFolder *)object;
                 STAssertNil(error, @"Error while retrieving newly created folder: %@", [error description]);
                 STAssertNotNil(newFolder, @"New folder should not be nil");
-                [newFolder deleteTreeWithDeleteAllVersions:YES withUnfileObjects:CMISDelete withContinueOnFailure:YES completionBlock:^(NSArray *failedObjects, NSError *error) {
+                [newFolder deleteTreeWithDeleteAllVersions:YES
+                                             unfileObjects:CMISDelete
+                                         continueOnFailure:YES
+                                           completionBlock:^(NSArray *failedObjects, NSError *error) {
                     STAssertNil(error, @"Error while deleting newly created folder: %@", [error description]);
 
                     self.testCompleted = YES;
@@ -639,14 +642,14 @@
         STAssertNotNil(discoveryService, @"Discovery service should not be nil");
 
         // Basic check if the service returns results that are usable
-        [discoveryService
-         query:@"SELECT * FROM cmis:document" searchAllVersions:NO
-         includeRelationShips:CMISIncludeRelationshipNone
-         renditionFilter:nil
-         includeAllowableActions:YES
-         maxItems:[NSNumber numberWithInt:3]
-         skipCount:[NSNumber numberWithInt:0]
-         completionBlock:^(CMISObjectList *objectList, NSError *error) {
+        [discoveryService query:@"SELECT * FROM cmis:document"
+              searchAllVersions:NO
+                  relationShips:CMISIncludeRelationshipNone
+                renditionFilter:nil
+            includeAllowableActions:YES
+                       maxItems:[NSNumber numberWithInt:3]
+                      skipCount:[NSNumber numberWithInt:0]
+                completionBlock:^(CMISObjectList *objectList, NSError *error) {
              STAssertNil(error, @"Got an error while executing query: %@", [error description]);
              STAssertNotNil(objectList, @"Object list after query should not be nil");
              
@@ -660,13 +663,12 @@
              }
              
              // Doing a query without any maxItems or skipCount, and also only requesting one property 'column'
-             [discoveryService
-              query:@"SELECT cmis:name FROM cmis:document WHERE cmis:name LIKE '%quote%'"
-              searchAllVersions:NO
-              includeRelationShips:CMISIncludeRelationshipNone
-              renditionFilter:nil
-              includeAllowableActions:YES
-              maxItems:nil skipCount:nil completionBlock:^(CMISObjectList *objectList, NSError *error) {
+             [discoveryService query:@"SELECT cmis:name FROM cmis:document WHERE cmis:name LIKE '%quote%'"
+                   searchAllVersions:NO
+                       relationShips:CMISIncludeRelationshipNone
+                     renditionFilter:nil
+             includeAllowableActions:YES
+                            maxItems:nil skipCount:nil completionBlock:^(CMISObjectList *objectList, NSError *error) {
                   STAssertNil(error, @"Got an error while executing query: %@", [error description]);
                   STAssertNotNil(objectList, @"Object list after query should not be nil");
                   STAssertTrue(objectList.objects.count > 0, @"Returned # objects is repo specific, but should be at least 1");
@@ -777,10 +779,11 @@
          CMISOperationContext *context = [[CMISOperationContext alloc] init];
          context.maxItemsPerPage = 2;
          context.skipCount = 0;
-         [self.session
-          queryObjectsWithTypeid:@"cmis:document"
-          withWhereClause:nil
-          searchAllVersions:NO operationContext:context completionBlock:^(CMISPagedResult *firstPageResult, NSError *error) {
+         [self.session queryObjectsWithTypeid:@"cmis:document"
+                                  whereClause:nil
+                            searchAllVersions:NO
+                             operationContext:context
+                              completionBlock:^(CMISPagedResult *firstPageResult, NSError *error) {
               STAssertNil(error, @"Got an error while executing query: %@", [error description]);
               STAssertTrue(firstPageResult.resultArray.count == 2, @"Expected 2 results, but got %d back", firstPageResult.resultArray.count);
               
@@ -921,9 +924,9 @@
              NSString *newContentFilePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"test_file_2.txt" ofType:nil];
              [self.session.binding.objectService
               changeContentOfObject:[CMISStringInOutParameter inOutParameterUsingInParameter:originalDocument.identifier]
-              toContentOfFile:newContentFilePath
-              withOverwriteExisting:YES
-              withChangeToken:nil
+                toContentOfFile:newContentFilePath
+                overwriteExisting:YES
+                changeToken:nil
               completionBlock: ^(NSError *error) {
                   if (error == nil) {
                       NSLog(@"Content has been successfully changed");
@@ -1037,10 +1040,10 @@
              // Prepare params
              CMISStringInOutParameter *objectIdInOutParam = [CMISStringInOutParameter inOutParameterUsingInParameter:document.identifier];
              CMISProperties *properties = [[CMISProperties alloc] init];
-             [properties addProperty:[CMISPropertyData createPropertyForId:kCMISPropertyName withStringValue:@"name_has_changed"]];
+             [properties addProperty:[CMISPropertyData createPropertyForId:kCMISPropertyName stringValue:@"name_has_changed"]];
              
              // Update properties and verify
-             [objectService updatePropertiesForObject:objectIdInOutParam withProperties:properties withChangeToken:nil completionBlock:^(NSError *error) {
+             [objectService updatePropertiesForObject:objectIdInOutParam properties:properties changeToken:nil completionBlock:^(NSError *error) {
                  STAssertNil(error, @"Got error while updating properties: %@", [error description]);
                  STAssertNotNil(objectIdInOutParam.outParameter, @"When updating properties, the object id should be returned");
                  
@@ -1077,8 +1080,8 @@
              CMISStringInOutParameter *objectIdParam = [CMISStringInOutParameter inOutParameterUsingInParameter:folderId];
              CMISProperties *updateProperties = [[CMISProperties alloc] init];
              NSString *renamedFolderName = [NSString stringWithFormat:@"temp_test_folder_renamed_%@", [self stringFromCurrentDate]];
-             [updateProperties addProperty:[CMISPropertyData createPropertyForId:kCMISPropertyName withStringValue:renamedFolderName]];
-             [objectService updatePropertiesForObject:objectIdParam withProperties:updateProperties withChangeToken:nil completionBlock:^(NSError *error) {
+             [updateProperties addProperty:[CMISPropertyData createPropertyForId:kCMISPropertyName stringValue:renamedFolderName]];
+             [objectService updatePropertiesForObject:objectIdParam properties:updateProperties changeToken:nil completionBlock:^(NSError *error) {
                  STAssertNil(error, @"Got error while updating folder properties: %@", [error description]);
                  STAssertNotNil(objectIdParam.outParameter, @"Returned object id should not be nil");
                  
@@ -1089,7 +1092,7 @@
                      STAssertEqualObjects(renamedFolder.name, renamedFolderName, @"Folder was not renamed, name is %@", renamedFolder.name);
                      
                      // Delete test folder
-                     [renamedFolder deleteTreeWithDeleteAllVersions:YES withUnfileObjects:CMISDelete withContinueOnFailure:YES completionBlock:^(NSArray *failedObjects, NSError *error) {
+                     [renamedFolder deleteTreeWithDeleteAllVersions:YES unfileObjects:CMISDelete continueOnFailure:YES completionBlock:^(NSArray *failedObjects, NSError *error) {
                          STAssertNil(error, @"Error while deleting newly created folder: %@", [error description]);
 
                          self.testCompleted = YES;
@@ -1383,11 +1386,11 @@
          
          // Try to convert with already CMISPropertyData. This should work just fine.
          NSMutableDictionary *properties = [[NSMutableDictionary alloc] init];
-         [properties setObject:[CMISPropertyData createPropertyForId:kCMISPropertyName withStringValue:@"testName"] forKey:kCMISPropertyName];
-         [properties setObject:[CMISPropertyData createPropertyForId:kCMISPropertyObjectTypeId withIdValue:@"cmis:document"] forKey:kCMISPropertyObjectTypeId];
-         [properties setObject:[CMISPropertyData createPropertyForId:kCMISPropertyCreationDate withDateTimeValue:testDate] forKey:kCMISPropertyCreationDate];
-         [properties setObject:[CMISPropertyData createPropertyForId:kCMISPropertyIsLatestVersion withBoolValue:YES] forKey:kCMISPropertyIsLatestVersion];
-         [properties setObject:[CMISPropertyData createPropertyForId:kCMISPropertyContentStreamLength withIntegerValue:5] forKey:kCMISPropertyContentStreamLength];
+         [properties setObject:[CMISPropertyData createPropertyForId:kCMISPropertyName stringValue:@"testName"] forKey:kCMISPropertyName];
+         [properties setObject:[CMISPropertyData createPropertyForId:kCMISPropertyObjectTypeId idValue:@"cmis:document"] forKey:kCMISPropertyObjectTypeId];
+         [properties setObject:[CMISPropertyData createPropertyForId:kCMISPropertyCreationDate dateTimeValue:testDate] forKey:kCMISPropertyCreationDate];
+         [properties setObject:[CMISPropertyData createPropertyForId:kCMISPropertyIsLatestVersion boolValue:YES] forKey:kCMISPropertyIsLatestVersion];
+         [properties setObject:[CMISPropertyData createPropertyForId:kCMISPropertyContentStreamLength integerValue:5] forKey:kCMISPropertyContentStreamLength];
          
          [self.session.objectConverter convertProperties:properties forObjectTypeId:@"cmis:document" completionBlock:^(CMISProperties *convertedProperties, NSError *error) {
              STAssertNil(error, @"Error while converting properties: %@", [error description]);
@@ -1463,7 +1466,7 @@
              // Use YES for retrieving the allowable actions
              CMISOperationContext *ctx = [[CMISOperationContext alloc] init];
              ctx.includeAllowableActions = YES;
-             [self.session retrieveObject:testDocument.identifier withOperationContext:ctx completionBlock:^(CMISObject *object, NSError *error) {
+             [self.session retrieveObject:testDocument.identifier operationContext:ctx completionBlock:^(CMISObject *object, NSError *error) {
                  CMISDocument *document = (CMISDocument *)object;
                  STAssertNil(error, @"Got error while retrieving object : %@", [error description]);
                  STAssertNotNil(document.allowableActions, @"Allowable actions should not be nil");
@@ -1472,7 +1475,7 @@
                  //Use NO for allowable actions
                  CMISOperationContext *ctx = [[CMISOperationContext alloc] init];
                  ctx.includeAllowableActions = NO;
-                 [self.session retrieveObject:testDocument.identifier withOperationContext:ctx completionBlock:^(CMISObject *object, NSError *error) {
+                 [self.session retrieveObject:testDocument.identifier operationContext:ctx completionBlock:^(CMISObject *object, NSError *error) {
                      CMISDocument *document = (CMISDocument *)object;
                      STAssertNil(error, @"Got error while retrieving object : %@", [error description]);
                      STAssertNil(document.allowableActions, @"Allowable actions should be nil");
@@ -1495,7 +1498,7 @@
          NSString *path = [NSString stringWithFormat:@"%@ios-test/test-word-doc.docx", self.rootFolder.path];
          CMISOperationContext *operationContext = [CMISOperationContext defaultOperationContext];
          operationContext.renditionFilterString = @"*";
-         [self.session retrieveObjectByPath:path withOperationContext:operationContext completionBlock:^(CMISObject *object, NSError *error) {
+         [self.session retrieveObjectByPath:path operationContext:operationContext completionBlock:^(CMISObject *object, NSError *error) {
              CMISDocument *document = (CMISDocument *)object;
              STAssertNil(error, @"Error while retrieving document: %@", [error description]);
              
@@ -1545,17 +1548,16 @@
          NSString *path = [NSString stringWithFormat:@"%@ios-test/test-word-doc.docx", self.rootFolder.path];
          CMISOperationContext *operationContext = [CMISOperationContext defaultOperationContext];
          operationContext.renditionFilterString = @"*";
-         [self.session retrieveObjectByPath:path withOperationContext:operationContext completionBlock:^(CMISObject *object, NSError *error) {
+         [self.session retrieveObjectByPath:path operationContext:operationContext completionBlock:^(CMISObject *object, NSError *error) {
              CMISDocument *document = (CMISDocument *)object;
              STAssertNil(error, @"Error while retrieving document: %@", [error description]);
              
              // Get renditions through service
-             [self.session.binding.objectService
-              retrieveRenditions:document.identifier
-              withRenditionFilter:@"*"
-              withMaxItems:nil
-              withSkipCount:nil
-              completionBlock:^(NSArray *renditions, NSError *error) {
+             [self.session.binding.objectService retrieveRenditions:document.identifier
+                                                    renditionFilter:@"*"
+                                                           maxItems:nil
+                                                          skipCount:nil
+                                                    completionBlock:^(NSArray *renditions, NSError *error) {
                   STAssertNil(error, @"Error while retrieving renditions: %@", [error description]);
                   STAssertTrue(renditions.count > 0, @"Expected at least one rendition");
                   CMISRenditionData *thumbnailRendition = nil;
@@ -1570,11 +1572,10 @@
                   // Download content through objectService
                   NSString *filePath = [NSString stringWithFormat:@"%@/testfile-rendition-through-objectservice.pdf", NSTemporaryDirectory()];
 //                  NSString *filePath = @"testfile-rendition-through-objectservice.pdf";
-                  [self.session.binding.objectService
-                   downloadContentOfObject:document.identifier
-                   withStreamId:thumbnailRendition.streamId
-                   toFile:filePath
-                   completionBlock: ^(NSError *error) {
+                  [self.session.binding.objectService downloadContentOfObject:document.identifier
+                                                                     streamId:thumbnailRendition.streamId
+                                                                       toFile:filePath
+                                                              completionBlock: ^(NSError *error) {
                        if (error == nil) {
                            // Assert File exists and check file length
                            STAssertTrue([[NSFileManager defaultManager] fileExistsAtPath:filePath], @"File does not exist");



Mime
View raw message