Downmerge from "develop" branch

Author: vlprof

.gitignore

@@ -18,3 +18,5 @@ DerivedData
 
 # Universal lib build
 jaspersoft-sdk-lib
+
+*.xccheckout

Classes/Core/JSConstants.h

@@ -1,6 +1,6 @@
 /*
  * Jaspersoft Mobile SDK
- * Copyright (C) 2011 - 2013 Jaspersoft Corporation. All rights reserved.
+ * Copyright (C) 2011 - 2014 Jaspersoft Corporation. All rights reserved.
  * http://community.jaspersoft.com/project/mobile-sdk-ios
  * 
  * Unless you have purchased a commercial license agreement from Jaspersoft,
@@ -47,7 +47,7 @@
 /**
  Get string representation for Boolean value
  
- @param aBool A Boolean value
+ @param aBOOL A Boolean value
  @return A new string @"true" or @"false" depends on provided Boolean value
  */
 + (NSString *)stringFromBOOL:(BOOL)aBOOL;
@@ -262,6 +262,7 @@
 @property (nonatomic, readonly) NSString *REST_INPUT_CONTROLS_URI;
 @property (nonatomic, readonly) NSString *REST_VALUES_URI;
 @property (nonatomic, readonly) NSString *REST_SERVER_INFO_URI;
+@property (nonatomic, readonly) NSString *REST_REPORT_EXECUTION_URI;
 /** @} */
 
 /**
@@ -270,6 +271,7 @@
  */
 @property (nonatomic, readonly) NSInteger VERSION_CODE_UNKNOWN;
 @property (nonatomic, readonly) NSInteger VERSION_CODE_EMERALD;
+@property (nonatomic, readonly) NSInteger VERSION_CODE_EMERALD_V2;
 @property (nonatomic, readonly) NSInteger VERSION_CODE_EMERALD_TWO;
 /** @} */
 

Classes/Core/JSConstants.m

@@ -1,6 +1,6 @@
 /*
  * Jaspersoft Mobile SDK
- * Copyright (C) 2011 - 2013 Jaspersoft Corporation. All rights reserved.
+ * Copyright (C) 2011 - 2014 Jaspersoft Corporation. All rights reserved.
  * http://community.jaspersoft.com/project/mobile-sdk-ios
  * 
  * Unless you have purchased a commercial license agreement from Jaspersoft,
@@ -151,8 +151,10 @@ @implementation JSConstants
 @synthesize REST_INPUT_CONTROLS_URI;
 @synthesize REST_VALUES_URI;
 @synthesize REST_SERVER_INFO_URI;
+@synthesize REST_REPORT_EXECUTION_URI;
 @synthesize VERSION_CODE_UNKNOWN;
 @synthesize VERSION_CODE_EMERALD;
+@synthesize VERSION_CODE_EMERALD_V2;
 @synthesize VERSION_CODE_EMERALD_TWO;
 @synthesize ICD_TYPE_BOOL;
 @synthesize ICD_TYPE_SINGLE_VALUE_TEXT;
@@ -367,13 +369,14 @@ - (void)setRESTURIPrefixes {
     REST_INPUT_CONTROLS_URI = @"/inputControls";
     REST_VALUES_URI = @"/values";
     REST_SERVER_INFO_URI = @"/serverInfo";
+    REST_REPORT_EXECUTION_URI = @"/reportExecutions";
 }
 
 - (void)setUPVersionCodes {
     VERSION_CODE_UNKNOWN = 0;
     VERSION_CODE_EMERALD = 50000;
+    VERSION_CODE_EMERALD_V2 = 50200;
     VERSION_CODE_EMERALD_TWO = 50500;
-    
 }
 
 - (void)setUPInputControlDescriptorTypes {

Classes/Core/JSCore.h

@@ -0,0 +1,38 @@
+/*
+ * Jaspersoft Mobile SDK
+ * Copyright (C) 2011 - 2014 Jaspersoft Corporation. All rights reserved.
+ * http://community.jaspersoft.com/project/mobile-sdk-ios
+ *
+ * Unless you have purchased a commercial license agreement from Jaspersoft,
+ * the following license terms apply:
+ *
+ * This program is part of Jaspersoft Mobile SDK for iOS.
+ *
+ * Jaspersoft Mobile SDK is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Jaspersoft Mobile SDK is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Jaspersoft Mobile SDK for iOS. If not, see
+ * <http://www.gnu.org/licenses/lgpl>.
+ */
+
+//
+//  JSCore.h
+//  Jaspersoft Corporation
+//
+
+#import "JSProfile.h"
+#import "JSRESTBase.h"
+#import "JSRESTReport.h"
+#import "JSRESTResource.h"
+#import "JSOperationResult.h"
+#import "JSRequest.h"
+#import "JSSerializer.h"
+#import "JSConstants.h"

Classes/Core/JSOperationResult.h

@@ -1,6 +1,6 @@
 /*
  * Jaspersoft Mobile SDK
- * Copyright (C) 2011 - 2013 Jaspersoft Corporation. All rights reserved.
+ * Copyright (C) 2011 - 2014 Jaspersoft Corporation. All rights reserved.
  * http://community.jaspersoft.com/project/mobile-sdk-ios
  * 
  * Unless you have purchased a commercial license agreement from Jaspersoft,

Classes/Core/JSOperationResult.m

@@ -1,6 +1,6 @@
 /*
  * Jaspersoft Mobile SDK
- * Copyright (C) 2011 - 2013 Jaspersoft Corporation. All rights reserved.
+ * Copyright (C) 2011 - 2014 Jaspersoft Corporation. All rights reserved.
  * http://community.jaspersoft.com/project/mobile-sdk-ios
  * 
  * Unless you have purchased a commercial license agreement from Jaspersoft,
@@ -83,9 +83,4 @@ - (BOOL)isError {
     return self.statusCode >= 400 && self.statusCode < 600;
 }
 
-- (NSString *)description {
-    return [NSString stringWithFormat:@"Status Code: %lu; AllHeaderFields %@; MIMEType %@; Error: %@", 
-            (unsigned long)self.statusCode, self.allHeaderFields, self.MIMEType, self.error];
-}
-
 @end

Classes/Core/JSProfile.h

@@ -1,6 +1,6 @@
 /*
  * Jaspersoft Mobile SDK
- * Copyright (C) 2011 - 2013 Jaspersoft Corporation. All rights reserved.
+ * Copyright (C) 2011 - 2014 Jaspersoft Corporation. All rights reserved.
  * http://community.jaspersoft.com/project/mobile-sdk-ios
  * 
  * Unless you have purchased a commercial license agreement from Jaspersoft,

Classes/Core/JSProfile.m

@@ -1,6 +1,6 @@
 /*
  * Jaspersoft Mobile SDK
- * Copyright (C) 2011 - 2013 Jaspersoft Corporation. All rights reserved.
+ * Copyright (C) 2011 - 2014 Jaspersoft Corporation. All rights reserved.
  * http://community.jaspersoft.com/project/mobile-sdk-ios
  * 
  * Unless you have purchased a commercial license agreement from Jaspersoft,

Classes/Core/JSRESTBase.h

@@ -1,6 +1,6 @@
 /*
  * Jaspersoft Mobile SDK
- * Copyright (C) 2011 - 2013 Jaspersoft Corporation. All rights reserved.
+ * Copyright (C) 2011 - 2014 Jaspersoft Corporation. All rights reserved.
  * http://community.jaspersoft.com/project/mobile-sdk-ios
  * 
  * Unless you have purchased a commercial license agreement from Jaspersoft,
@@ -87,6 +87,13 @@
 @property (nonatomic, assign) JSRequestBackgroundPolicy requestBackgroundPolicy;
 #endif
 
+/**
+ An NSArray of NSHTTPCookie objects
+
+ @since 1.8
+ */
+@property (nonatomic, readonly) NSArray *cookies;
+
 /** 
  Returns a rest base instance with provided server profile (for authentication) 
  and list of classes for which mapping rules will be created. 

Classes/Core/JSRESTBase.m

@@ -1,6 +1,6 @@
 /*
  * Jaspersoft Mobile SDK
- * Copyright (C) 2011 - 2013 Jaspersoft Corporation. All rights reserved.
+ * Copyright (C) 2011 - 2014 Jaspersoft Corporation. All rights reserved.
  * http://community.jaspersoft.com/project/mobile-sdk-ios
  * 
  * Unless you have purchased a commercial license agreement from Jaspersoft,
@@ -137,6 +137,7 @@ - (id)initWithProfile:(JSProfile *)profile classesForMappings:(NSArray *)classes
         self.restKitClient.authenticationType = RKRequestAuthenticationTypeHTTPBasic;
         self.restKitClient.cachePolicy = RKRequestCachePolicyNone;
         self.restKitClient.requestCache.storagePolicy = RKRequestCacheStoragePolicyDisabled;
+        self.restKitClient.disableCertificateValidation = YES;
 
         // Sets default content-type and charset for RKClient. This is required step or
         // there will be an parsing error
@@ -166,9 +167,9 @@ - (id)init {
 }
 
 - (void)setServerProfile:(JSProfile *)serverProfile {
-    // Delete cookies for servers. If don't do this old credentials will be used 
+    // Delete cookies for current server profile. If don't do this old credentials will be used
     // instead new one
-    [self deleteCookiesForServer:_serverProfile];    
+    [self deleteCookies];
     _serverProfile = serverProfile;
 
     // Sets authentication. This will also change authentication for 
@@ -310,6 +311,22 @@ - (void)cancelAllRequests {
     [self.requestCallBacks removeAllObjects];
 }
 
+- (NSArray *)cookies {
+    if (!self.serverProfile.serverUrl) return nil;
+
+    NSHTTPCookieStorage *cookieStorage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
+    NSString *host = [[NSURL URLWithString:self.serverProfile.serverUrl] host];
+
+    NSMutableArray *cookies = [NSMutableArray array];
+    for (NSHTTPCookie *cookie in cookieStorage.cookies) {
+        if ([cookie.domain isEqualToString:host]) {
+            [cookies addObject:cookie];
+        }
+    }
+
+    return cookies;
+}
+
 #pragma mark -
 #pragma mark Private methods
 
@@ -380,16 +397,10 @@ - (void)callRequestFinishedCallBackForRestKitRequest:(id)restKitRequest result:(
 }
 
 // Deletes all cookies for specified server
-- (void)deleteCookiesForServer:(JSProfile *)serverProfile {
-    if (!serverProfile.serverUrl) return;
-    
+- (void)deleteCookies {
     NSHTTPCookieStorage *cookieStorage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
-    NSString *host = [[NSURL URLWithString:serverProfile.serverUrl] host];
-    
-    for (NSHTTPCookie *cookie in cookieStorage.cookies) {
-        if ([cookie.domain isEqualToString:host]) {
-            [cookieStorage deleteCookie:cookie];
-        }
+    for (NSHTTPCookie *cookie in self.cookies) {
+        [cookieStorage deleteCookie:cookie];
     }
 }
 
@@ -409,10 +420,12 @@ - (JSOperationResult *)setServerInfo:(JSOperationResult *)result {
     } else {
         self.serverProfile.serverInfo = [[JSServerInfo alloc] init];
 
+        JSRequest *request = result.request;
         result = [[JSOperationResult alloc] initWithStatusCode:203
                                                allHeaderFields:result.allHeaderFields
                                                       MIMEType:result.MIMEType
                                                          error:nil];
+        result.request = request;
     }
 
     return result;