@@ -10,22 +10,6 @@ @implementation CocoaWebResourceViewController -// setup the docroot for the http server -- (NSString*)setupDocroot -{ - NSString* docroot =[NSString stringWithFormat:@"%@/tmp/docroot", NSHomeDirectory()]; - NSLog(docroot); - NSFileManager *manager = [NSFileManager defaultManager]; - NSError *error; - if(![manager removeItemAtPath:docroot error:&error]) - { - NSLog(@"Can not remove old docroot: %@", error); - } - NSString *path = [NSString stringWithFormat:@"%@/%@", [[NSBundle mainBundle] bundlePath], @"docroot"]; - [manager createSymbolicLinkAtPath:docroot withDestinationPath:path error:&error]; - return docroot; -} - // load file list - (void)loadFileList { @@ -45,15 +29,12 @@ fileList = [[NSMutableArray alloc] init]; [self loadFileList]; - // setup the docroot for the http server - NSString * docroot = [self setupDocroot]; - + // set up the http server httpServer = [[HTTPServer alloc] init]; - [httpServer setType:@"_http._tcp."]; - + [httpServer setType:@"_http._tcp."]; [httpServer setPort:8080]; [httpServer setName:@"CocoaWebResource"]; - [httpServer setDocumentRoot:docroot]; + [httpServer setupBuiltInDocroot]; httpServer.fileResourceDelegate = self; [super viewDidLoad]; Classes/CocoaWebResourceViewController.m @@ -67,4 +67,6 @@ - (int)numberOfHTTPConnections; - (NSString*)hostName; + +- (void)setupBuiltInDocroot; @end CocoaWebResource/HTTPServer.h @@ -359,4 +359,22 @@ NSLog(@"Error Dict: %@", errorDict); } +#pragma mark built-in web service + +// setup the docroot for the http server +- (void)setupBuiltInDocroot +{ + NSString* docroot =[NSString stringWithFormat:@"%@/tmp/docroot", NSHomeDirectory()]; + NSLog(docroot); + NSFileManager *manager = [NSFileManager defaultManager]; + NSError *error; + if(![manager removeItemAtPath:docroot error:&error]) + { + NSLog(@"Can not remove old docroot: %@", error); + } + NSString *path = [NSString stringWithFormat:@"%@/%@", [[NSBundle mainBundle] bundlePath], @"docroot"]; + [manager createSymbolicLinkAtPath:docroot withDestinationPath:path error:&error]; + [self setDocumentRoot:docroot]; +} + @end CocoaWebResource/HTTPServer.m 864961312daafa690ae084bbcae203cc1a35f872 Robin Lu iamawalrus@gmail.com http://github.com/robin/cocoa-web-resource/commit/8c1736c954b89e229abc8f4121213eacd185c0ca 8c1736c954b89e229abc8f4121213eacd185c0ca 2008-12-01T05:59:38-08:00 2008-12-01T05:59:38-08:00 move docroot setup into httpserver 2ebc1a0c431097f8a55e1dd404e8daded5ef22d4 Robin Lu iamawalrus@gmail.com