LukeIS: updating the CocoaHTTPServer for iOS to the latest and greate…

…st. Ignoring one Click Scrolling Test for iphone that is failing.

Fixes Issue 1396.
Fixes Issue 2747.
Fixes Issue 2869.
Fixes Issue 2431.

r15285

iphone/lib/buildtime-src/cocoahttpserver/extensions/HTTPStaticResource.h

@@ -3,6 +3,7 @@
 //  iWebDriver
 //
 //  Copyright 2009 Google Inc.
+//  Copyright 2011 Software Freedom Convervancy.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -18,18 +19,18 @@
 
 #import <Foundation/Foundation.h>
 #import "HTTPResource.h"
-#import "HTTPResponse.h"
+#import "HTTPRedirectResponse.h"
 
 // An HTTPResource which always responds with a particular response.
 @interface HTTPStaticResource : NSObject<HTTPResource> {
-	id<HTTPResponse,NSObject> response;
+	HTTPRedirectResponse* response;
 }
 
-@property(nonatomic, retain) id<HTTPResponse,NSObject> response;
+@property(nonatomic, retain) HTTPRedirectResponse* response;
 
-- (id)initWithResponse:(id<HTTPResponse,NSObject>)theResponse;
+- (id)initWithResponse:(HTTPRedirectResponse*)theResponse;
 
-+ (HTTPStaticResource *)resourceWithResponse:(id<HTTPResponse,NSObject>)theResponse;
++ (HTTPStaticResource *)resourceWithResponse:(HTTPRedirectResponse*)theResponse;
 
 + (HTTPStaticResource *)redirectWithURL:(NSString *)url;
 

iphone/lib/buildtime-src/cocoahttpserver/extensions/HTTPStaticResource.m

@@ -3,6 +3,7 @@
 //  iWebDriver
 //
 //  Copyright 2009 Google Inc.
+//  Copyright 2011 Software Freedom Convervancy.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -23,7 +24,7 @@ @implementation HTTPStaticResource
 
 @synthesize response;
 
-- (id)initWithResponse:(id<HTTPResponse,NSObject>)theResponse
+- (id)initWithResponse:(HTTPRedirectResponse*)theResponse
 {
 	if (![super init])
 		return nil;
@@ -40,18 +41,20 @@ - (void)dealloc
 	[super dealloc];
 }
 
-+ (HTTPStaticResource *)resourceWithResponse:(id<HTTPResponse,NSObject>)theResponse
++ (HTTPStaticResource *)resourceWithResponse:(HTTPRedirectResponse*)theResponse
 {
 	return [[[self alloc] initWithResponse:theResponse] autorelease];
 }
 
 + (HTTPStaticResource *)redirectWithURL:(NSString *)url
 {
-	return [self resourceWithResponse:[HTTPRedirectResponse redirectToURL:url]];
+	return [self resourceWithResponse:
+          [[HTTPRedirectResponse alloc] initWithPath:url]
+  ];
 }
 
 // Get the HTTP response to this request
-- (id<HTTPResponse,NSObject>)httpResponseForQuery:(NSString *)query
+- (HTTPRedirectResponse*)httpResponseForQuery:(NSString *)query
 										  method:(NSString *)method
 										withData:(NSData *)theData
 {

iphone/lib/buildtime-src/cocoahttpserver/extensions/HTTPVirtualDirectory.h

@@ -3,6 +3,7 @@
 //  iWebDriver
 //
 //  Copyright 2009 Google Inc.
+//  Copyright 2011 Software Freedom Convervancy.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -35,7 +36,7 @@
 
 // The index of the vdir. This will be returnd on .../vdir/ and .../vdir
 // You can make this a redirect to index.html or something if you want.
-@property (nonatomic, retain) id<HTTPResource> index;
+@property (nonatomic, retain) NSObject* index;
 
 // Do we redirect /foo/self to /foo/self/ or just return index?
 @property (nonatomic) BOOL redirectBaseToIndex;
@@ -46,7 +47,7 @@
 // Set a virtual file in the VirtualDirectory. The resource is retained.
 // If resource is nil, this method removes the named resource from the
 // VirtualDirectory. 
-- (void)setResource:(id<HTTPResource>)resource withName:(NSString *)name;
+- (void)setResource:(NSObject*)resource withName:(NSString *)name;
 
 // Remove a resource from the VirtualDirectory.
 - (void)removeResourceWithName:(NSString *)name;

iphone/lib/buildtime-src/cocoahttpserver/extensions/HTTPVirtualDirectory.m

@@ -3,6 +3,7 @@
 //  iWebDriver
 //
 //  Copyright 2009 Google Inc.
+//  Copyright 2011 Software Freedom Convervancy.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -46,7 +47,7 @@ + (HTTPVirtualDirectory *)virtualDirectory
 	return [[[self alloc] init] autorelease];
 }
 
-- (void)setResource:(id<HTTPResource>)resource withName:(NSString *)name
+- (void)setResource:(NSObject*)resource withName:(NSString *)name
 {
 	[contents setValue:resource forKey:name];
 }

iphone/src/objc/Database.h

@@ -1,6 +1,7 @@
 /*
  Copyright 2010 WebDriver committers
  Copyright 2010 Google Inc.
+ Copyright 2011 Software Freedom Convervancy.
  
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <HTTPVirtualDirectory.h>
+#import "HTTPVirtualDirectory.h"
 #import <sqlite3.h>
 
 @interface Database : HTTPVirtualDirectory {

iphone/src/objc/HTTPJSONResponse.h

@@ -3,6 +3,7 @@
 //  iWebDriver
 //
 //  Copyright 2009 Google Inc.
+//  Copyright 2011 Software Freedom Convervancy.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -17,7 +18,7 @@
 //  limitations under the License.
 
 #import <Foundation/Foundation.h>
-#import "HTTPResponse.h"
+#import "HTTPDataResponse.h"
 
 // |HTTPJSONResponse| wraps |HTTPDataResponse| for JSON data. It is used to
 // return JSON from an HTTP method.

iphone/src/objc/HTTPJSONResponse.m

@@ -3,6 +3,7 @@
 //  iWebDriver
 //
 //  Copyright 2009 Google Inc.
+//  Copyright 2011 Software Freedom Convervancy.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -41,8 +42,8 @@ + (HTTPJSONResponse *)responseWithObject:(id)object {
     return [[[self alloc] initWithObject:object] autorelease];
 }
 
-- (NSString *)contentType {
-  return @"application/json; charset=UTF-8";
+- (NSDictionary *)httpHeaders {
+	return [NSDictionary dictionaryWithObject:@"application/json; charset=UTF-8" forKey:@"Content-Type"];
 }
 
 @end

iphone/src/objc/HTTPPNGResponse.h

@@ -3,6 +3,7 @@
 //  iWebDriver
 //
 //  Copyright 2009 Google Inc.
+//  Copyright 2011 Software Freedom Convervancy.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -17,7 +18,7 @@
 //  limitations under the License.
 
 #import <Foundation/Foundation.h>
-#import "HTTPResponse.h"
+#import "HTTPDataResponse.h"
 
 // |HTTPPNGResponse| wraps |HTTPDataResponse| for image data. It is used to
 // return a PNG from an HTTP method.

iphone/src/objc/HTTPResponse+Utility.h

@@ -3,6 +3,7 @@
 //  iWebDriver
 //
 //  Copyright 2009 Google Inc.
+//  Copyright 2011 Software Freedom Convervancy.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -17,7 +18,7 @@
 //  limitations under the License.
 
 #import <Foundation/Foundation.h>
-#import "HTTPResponse.h"
+#import "HTTPDataResponse.h"
 
 // The |Utility| category adds some convenience methods to HTTPDataResponse
 // allowing |HTTPDataResponse|s to be created from strings.

iphone/src/objc/HTTPServerController.m

@@ -3,6 +3,7 @@
 //  iWebDriver
 //
 //  Copyright 2009 Google Inc.
+//  Copyright 2011 Software Freedom Convervancy.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -17,7 +18,7 @@
 //  limitations under the License.
 
 #import "HTTPServerController.h"
-#import "WebDriverHTTPServer.h"
+#import "HTTPServer.h"
 #import "WebDriverHTTPConnection.h"
 #import "RESTServiceMapping.h"
 #import "WebDriverPreferences.h"
@@ -85,11 +86,10 @@ -(id) init {
   UInt16 portNumber = [[WebDriverPreferences sharedInstance] serverPortNumber];
   NSString* grid = [[WebDriverPreferences sharedInstance] gridLocation];
 
-  server_ = [[WebDriverHTTPServer alloc] init];
+  server_ = [[HTTPServer alloc] init];
 
   [server_ setType:@"_http._tcp."];
   [server_ setPort:portNumber];
-  [server_ setDelegate:self];
   [server_ setConnectionClass:[WebDriverHTTPConnection class]];
 
   NSError *error;
@@ -215,7 +215,7 @@ +(HTTPServerController*) sharedInstance {
   return singleton;
 }
 
-- (NSObject<HTTPResponse> *)httpResponseForRequest:(CFHTTPMessageRef)request {
+- (NSObject<HTTPResponse> *)httpResponseForRequest:(HTTPMessage*)request {
   return [serviceMapping_ httpResponseForRequest:request];
 }
 

iphone/src/objc/RESTServiceMapping.h

@@ -3,6 +3,7 @@
 //  iWebDriver
 //
 //  Copyright 2009 Google Inc.
+//  Copyright 2011 Software Freedom Convervancy.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -19,6 +20,7 @@
 #import <Foundation/Foundation.h>
 #import <CFNetwork/CFNetwork.h>
 #import "HTTPResponse.h"
+#import "HTTPMessage.h"
 
 @class HTTPVirtualDirectory;
 
@@ -36,6 +38,6 @@
 - (id) initWithIpAddress:(NSString *)ipAddress 
                     port:(int)port;
 
-- (NSObject<HTTPResponse> *)httpResponseForRequest:(CFHTTPMessageRef)request;
+- (NSObject<HTTPResponse> *)httpResponseForRequest:(HTTPMessage*)request;
 
 @end