libs-gsweb/GSWeb.framework/GSWDeployedBundle.m
Dave Wetzel 0c43a77fd2 * GSWExtensionsGSW.framework/GSWFileUploadComponent.m
* GSWExtensionsGSW.framework/GSWLogin.m
	removed logs
	* GSWExtensionsGSW.framework/GNUmakefile
	added ADDITIONAL_OBJCFLAGS = -Werror-implicit-function-declaration
	* GSWExtensionsGSW.framework/GSWCacheElement.m
	removed logs, use object_getClassName
	* GSWExtensionsGSW.framework/GSWValidationFailureComponent.m
	* GSWExtensionsGSW.framework/GSWTabComponent.m
	* GSWExtensionsGSW.framework/GSWFileUploadFormComponent.m
	* GSWExtensionsGSW.framework/GSWSimpleFormComponent.m
	* GSWeb.framework/GSWApplication.m
	removed logs, _validateAPI
	ClassIsKindOfClass -> GSObjCIsKindOf
	* GSWeb.framework/GSWAction.m
	include <GNUstepBase/NSObject+GNUstepBase.h>
	removed logs and unused (commented) code
	* GSWeb.framework/GSWResourceManager.h
	removed _validateAPI
	* GSWeb.framework/GSWImageButton.m
	added #include <GNUstepBase/NSObject+GNUstepBase.h>
	removed logs and unused (commented) code
	* GSWeb.framework/NSString+HTML.h
	changed int to NSUInteger / NSInteger
	* GSWeb.framework/GSWResourceManager.m
	removed logs, _validateAPI
	* GSWeb.framework/GSWContext.m 
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	* GSWeb.framework/GSWRequestHandler.m
	include <GNUstepBase/NSObject+GNUstepBase.h>
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	* GSWeb.framework/NSString+HTML.m
	include <GNUstepBase/NSString+GNUstepBase.h>
	changed int to NSUInteger
	use memmove in GSWMemMove macro
	disabled testStringByConvertingHTML
	removed logs
	fixed warnings
	* GSWeb.framework/GSWMultiKeyDictionary.m
	removed logs
	* GSWeb.framework/GSWVBScript.m
	removed logs
	* GSWeb.framework/NSNonBlockingFileHandle.m
	removed logs
	* GSWeb.framework/GSWStatisticsStore.h
	removed useless @interface / @end for the same class
	* GSWeb.framework/GSWLifebeatThread.m
	removed include <GNUstepBase/GSCategories.h>
	removed logs
	* GSWeb.framework/GSWStatisticsStore.m
	removed logs
	include <GNUstepBase/NSObject+GNUstepBase.h>
	include <GNUstepBase/NSString+GNUstepBase.h>
	implement _purgePathsStatistics, _updatePathsStatisticsWithPaths
	removed useless @implementation / @end for the same class
	* GSWeb.framework/GSWCookie.m
	removed logs
	* GSWeb.framework/GNUmakefile
	added ADDITIONAL_OBJCFLAGS = -Werror-implicit-function-declaration
	* GSWeb.framework/GSWRecording.m
	removed logs
	* GSWeb.framework/GSWToggle.m
	removed logs
	* GSWeb.framework/GSWMessage.m
	include <GNUstepBase/NSObject+GNUstepBase.h>
	globalDefaultEncoding = [NSString defaultCStringEncoding];
	(see http://wiki.gnustep.org/index.php/GSWebFAQ )
	use NSUInteger for index
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	* GSWeb.framework/GSWDefaultAdaptor.m
	include <GNUstepBase/NSObject+GNUstepBase.h>
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	* GSWeb.framework/GSWJavaScript.m
	* GSWeb.framework/GSWClientSideScript.m
	removed logs
	* GSWeb.framework/GSWNestedList.m
	removed logs
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	* GSWeb.framework/GSWEmbeddedObject.m	
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	* GSWeb.framework/GSWRequest.h
	removed _validateAPI
	* GSWeb.framework/GSWRequest.m
	add includes
	removed _validateAPI
	removed logs
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	* GSWeb.framework/GSWUtils.h
	unsigned int -> NSUInteger
	* GSWeb.framework/Resources/languages.plist
	added languages
	* GSWeb.framework/GSWUtils.m
	add includes
	unsigned int -> NSUInteger
	removed logs
	* GSWeb.framework/GSWComponentReference.m	
	removed logs
	* GSWeb.framework/GSWGeometricRegion.m
	add includes
	removed logs
	* GSWeb.framework/GSWKeyValueAssociation.m
	add includes
	removed logs
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	* GSWeb.framework/GSWHiddenField.m
	removed logs
	* GSWeb.framework/GSWParam.m
	add includes
	removed logs
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	* GSWeb.framework/NSString+Trimming.h
	* GSWeb.framework/NSString+Trimming.m
	removed longValue, ulongValue, longLongValue;
	removed logs
	* GSWeb.framework/GSWStaticResourceRequestHandler.m
	removed logs
	* GSWeb.framework/GSWURLValuedElementData.m
	removed logs
	* GSWeb.framework/GSWDirectAction.m
	takeValue -> setValue
	removed logs
	int -> NSUInteger
	* GSWeb.framework/GSWComponentDefinition.m
	add includes
	removed logs
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	* GSWeb.framework/GSWAssociation.m
	add includes
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	removed logs
	* GSWeb.framework/GSWSession.h
	* GSWeb.framework/GSWSession.m
	unsigned int-> NSUInteger
	add includes
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	removed logs
	David Ayers: pls check sleepInContext!
	removed _validateAPI, __setContextCounterIncrementingEnabled, __counterIncrementingEnabledFlag
	* GSWeb.framework/GSWFileUpload.m
	removed logs
	* GSWeb.framework/GSWApplet.m
	add includes
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	* GSWeb.framework/GSWGenericElement.m
	removed logs
	GSWeb.framework/GSWTemplateParser.m
	add includes
	* GSWeb.framework/GSWTemporaryElement.m		
	removed logs
	* GSWeb.framework/GSWResponse.m
	add include
	removed docStructure checks
	removed logs
	* GSWeb.framework/GSWProjectBundle.m
	add include
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	removed logs
	* GSWeb.framework/GSWWorkerThread.m
	added - drain
	removed NSLog
	* GSWeb.framework/GSWApplication+Defaults.m
	add include			
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	removed logs
	* GSWeb.framework/GSWActiveImage.m
	* GSWeb.framework/GSWDirectActionRequestHandler.m
	* GSWeb.framework/GSWConstantValueAssociation.m
	* GSWeb.framework/NSData+Compress.m
	removed logs
	* GSWeb.framework/GSWHTMLStaticElement.m	
	add includes
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	removed logs
	* GSWeb.framework/GSWServerSessionStore.m
	removed logs
	* GSWeb.framework/GSWAdaptor.m
	add includes
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	* GSWeb.framework/GSWDeployedBundle.m
	removed logs
	add includes
	* GSWeb.framework/GSWSubmitButton.m
	removed logs
	* GSWeb.framework/GSWDeclarationParser.m
	add includes
	removed logs
	* GSWeb.framework/GSWBundle.m
	add includes
	removed logs
	clearCache
	* GSWeb.framework/GSWWOCompatibility.h
	fixed typo in WOMessage
	* GSWeb.framework/GSWSessionTimeOut.m
	removed logs
	* GSWeb.framework/GSWPopUpButton.m	
	add includes
	* GSWeb.framework/GSWComponent.m
	add includes
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	* GSWeb.framework/GSWHTTPIO.m
	add include
	* GSWeb.framework/GSWBindingNameAssociation.m
	takeValue -> setValue
	* GSWeb.framework/GSWHTMLTemplateParser.m
	removed logs
	* GSWeb.framework/GSWResetButton.m
	removed logs
	* GSWeb.framework/GSWDebug.h/m
	disabled log funtions
	* GSWeb.framework/GSWActionRequestHandler.m
	add includes
	removed logs
	* GSWeb.framework/GSWSwitchComponent.m
	* GSWeb.framework/GSWSessionTimeOutManager.m
	removed logs
	* GSWeb.framework/GSWMailDelivery.m
	add includes
	removed logs
	* GSWeb.framework/GSWDynamicURLString.h
	* GSWeb.framework/GSWDynamicURLString.m
	unsigned int -> NSUInteger
	removed checkURL
	add includes
	* GSWeb.framework/GSWProcFS.m		
	removed logs
	* GSWeb.framework/GSWApplication.h
	removed _validateAPI
	* GSWeb.framework/GSWResourceRequestHandler.m
	add include
	removed logs
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	* GSWeb.framework/GSWSessionStore.h
	removed _validateAPI
	* GSWeb.framework/GSWSessionStore.m
	add include
	removed _validateAPI
	removed logs
	* GSWExtensions.framework/GSWLongResponsePage.m
	* GSWExtensions.framework/GSWExceptionPage.m
	* GSWExtensions.framework/GSWMetaRefresh.m
	* GSWExtensions.framework/GSWCollapsibleComponentContent.m
	removed logs
	* GSWExtensions.framework/GNUmakefile
	added ADDITIONAL_OBJCFLAGS = -Werror-implicit-function-declaration
	* GSWExtensions.framework/GSWStatsPage.m
	removed logs
	unsigned int -> NSUInteger
	* Examples/hello/HelloPage.wo/HelloPage.html
	* Examples/hello/Main.wo/Main.html
	* Examples/hello/Hello.m
	convert to UTF8
	
	The change of
	LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd];
	will show where we need to implement functionality.
	Please send bug reports! -- dw



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@30584 72102866-910b-0410-8b05-ffd578937521
2010-06-05 21:08:12 +00:00

610 lines
18 KiB
Objective-C

/** GSWDeployedBundle.m - <title>GSWeb: Class GSWDeployedBundle</title>
Copyright (C) 1999-2004 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Mar 1999
$Revision$
$Date$
<abstract></abstract>
This file is part of the GNUstep Web Library.
<license>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library 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
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
</license>
**/
#include "config.h"
RCS_ID("$Id$")
#include "GSWeb.h"
#include <GNUstepBase/NSThread+GNUstepBase.h>
#include <GNUstepBase/NSObject+GNUstepBase.h>
//====================================================================
@implementation GSWDeployedBundle
//--------------------------------------------------------------------
-(id)initWithPath:(NSString*)aPath
{
if ((self=[super init]))
{
ASSIGN(_bundlePath,[aPath stringGoodPath]);
ASSIGN(_wrapperName,([_bundlePath lastPathComponent]));
ASSIGN(_projectName,([_wrapperName stringByDeletingPathExtension]));
_isFramework=[_bundlePath hasSuffix:GSFrameworkSuffix];//Ok ?
_relativePathsCache=[GSWMultiKeyDictionary new];
_absolutePathsCache=[NSMutableDictionary new];
_urlsCache=[NSMutableDictionary new];
#ifndef NDEBUG
_creation_thread_id=GSCurrentThread();
#endif
_selfLock=[NSRecursiveLock new];
};
return self;
};
//--------------------------------------------------------------------
-(void)dealloc
{
DESTROY(_bundlePath);
DESTROY(_wrapperName);
DESTROY(_projectName);
DESTROY(_relativePathsCache);
DESTROY(_absolutePathsCache);
DESTROY(_urlsCache);
DESTROY(_selfLock);
[super dealloc];
};
//--------------------------------------------------------------------
-(NSString*)description
{
NSString* descr=nil;
descr=[NSString stringWithFormat:@"<%s %p - ",
object_getClassName(self),
(void*)self];
descr=[descr stringByAppendingFormat:@"bundlePath:%@ ",
_bundlePath];
descr=[descr stringByAppendingFormat:@"relativePathsCache=%p>",
(void*)_relativePathsCache];
return descr;
};
//--------------------------------------------------------------------
-(GSWProjectBundle*)projectBundle
{
//OK
NSString* projectName=nil;
BOOL isFramework=NO;
GSWDeployedBundle* projectBundle=nil;
projectName=[self projectName];
isFramework=[self isFramework];
projectBundle=[GSWProjectBundle projectBundleForProjectNamed:projectName
isFramework:isFramework];
return (GSWProjectBundle*)projectBundle;
};
//--------------------------------------------------------------------
-(BOOL)isFramework
{
return _isFramework;
};
//--------------------------------------------------------------------
-(NSString*)wrapperName
{
return _wrapperName;
};
//--------------------------------------------------------------------
-(NSString*)projectName
{
return _projectName;
};
//--------------------------------------------------------------------
-(NSString*)bundlePath
{
return _bundlePath;
};
//--------------------------------------------------------------------
-(NSString*)bundleURLPrefix
{
NSString* urlPrefix=nil;
NSString* wrapperName=nil;
if ([self isFramework]) // get framework prefix ?
urlPrefix = [GSWApplication frameworksBaseURL];
else
urlPrefix = [GSWApplication applicationBaseURL];
NSAssert([urlPrefix length]>0,@"No urlPrefix");
wrapperName=[self wrapperName];
NSAssert([wrapperName length]>0,@"No wrapperName");
if (urlPrefix && wrapperName)
{
urlPrefix=[urlPrefix stringByAppendingPathComponent:wrapperName];
};
return urlPrefix;
};
//--------------------------------------------------------------------
-(NSArray*)pathsForResourcesOfType:(NSString*)aType
{
//OK
NSArray* paths=nil;
[self lock];
NS_DURING
{
paths=[self lockedPathsForResourcesOfType:aType];
}
NS_HANDLER
{
//TODO
[self unlock];
[localException raise];
};
NS_ENDHANDLER;
[self unlock];
return paths;
};
//--------------------------------------------------------------------
-(NSArray*)lockedPathsForResourcesOfType:(NSString*)aType
{
[self notImplemented: _cmd];
return nil;
};
//--------------------------------------------------------------------
-(NSString*)relativePathForResourceNamed:(NSString*)aName
language:(NSString*)aLanguage
{
//OK
NSString* path=nil;
[self lock];
NS_DURING
{
path=[self lockedRelativePathForResourceNamed:aName
language:aLanguage];
}
NS_HANDLER
{
//TODO
[self unlock];
[localException raise];
};
NS_ENDHANDLER;
[self unlock];
return path;
};
//--------------------------------------------------------------------
-(NSString*)relativePathForResourceNamed:(NSString*)aName
languages:(NSArray*)someLanguages
{
NSString* path=nil;
[self lock];
NS_DURING
{
path=[self lockedRelativePathForResourceNamed:aName
languages:someLanguages];
//NSDebugMLLog(@"bundles",@"path=%@",path);
}
NS_HANDLER
{
//TODO
[self unlock];
[localException raise];
};
NS_ENDHANDLER;
[self unlock];
return path;
};
//--------------------------------------------------------------------
-(NSString*)lockedRelativePathForResourceNamed:(NSString*)aName
language:(NSString*)aLanguage
{
//OK
NSString* path=nil;
path=[self lockedRelativePathForResourceNamed:aName
inDirectory:@"Resources/WebServer"
language:aLanguage];
if (!path)
{
path=[self lockedRelativePathForResourceNamed:aName
inDirectory:@"Resources"
language:aLanguage];
if (!path)
{
path=[self lockedRelativePathForResourceNamed:aName
inDirectory:@"."
language:aLanguage];
};
};
return path;
};
//--------------------------------------------------------------------
-(NSString*)lockedRelativePathForResourceNamed:(NSString*)aName
languages:(NSArray*)someLanguages
{
//OK
NSString* path=nil;
path=[self lockedRelativePathForResourceNamed:aName
inDirectory:@"Resources/WebServer"
languages:someLanguages];
if (!path)
{
path=[self lockedRelativePathForResourceNamed:aName
inDirectory:@"Resources"
languages:someLanguages];
if (!path)
{
path=[self lockedRelativePathForResourceNamed:aName
inDirectory:@"."
languages:someLanguages];
};
};
return path;
};
//--------------------------------------------------------------------
-(NSString*)lockedRelativePathForResourceNamed:(NSString*)aName
inDirectory:(NSString*)aDirectory
languages:(NSArray*)someLanguages
{
//OK
NSString* path=nil;
if (someLanguages)
{
int i=0;
int someLanguagesCount=[someLanguages count];
for(i=0;!path && i<someLanguagesCount;i++)
{
path=[self lockedCachedRelativePathForResourceNamed:aName
inDirectory:aDirectory
language:[someLanguages objectAtIndex:i]];
};
};
if (!path)
path=[self lockedCachedRelativePathForResourceNamed:aName
inDirectory:aDirectory
language:nil];
return path;
};
//--------------------------------------------------------------------
-(NSString*)lockedCachedRelativePathForResourceNamed:(NSString*)aName
inDirectory:(NSString*)aDirectory
language:(NSString*)aLanguage
{
//OK
NSString* path=nil;
if (aName)
{
NSAutoreleasePool* arp = [NSAutoreleasePool new];
NS_DURING
{
NSString* emptyString=@"";
NSString* bundlePath=[self bundlePath];
if ([aDirectory isEqualToString:@"."])
aDirectory=nil;
if (aLanguage)
path=[_relativePathsCache objectForKeys:aName,
(bundlePath ? bundlePath : emptyString),
(aDirectory ? aDirectory : emptyString),
(aLanguage ? aLanguage : emptyString),
nil];
else
path=[_relativePathsCache objectForKeys:aName,
(bundlePath ? bundlePath : emptyString),
(aDirectory ? aDirectory : emptyString),
nil];
if (path==GSNotFoundMarker)
path=nil;
else if (!path)
{
//TODO: use a mutable string for path ?
//call again _relativePathForResourceNamed:inDirectory:language:
NSString* completePathTest=nil;
BOOL exists=NO;
NSFileManager* fileManager=nil;
NSString* pathTest=@"";
if (aDirectory)
pathTest=[pathTest stringByAppendingPathComponent:aDirectory];
//NSDebugMLLog(@"bundles",@"_pathTest=%@",_pathTest);
if (aLanguage)
pathTest=[pathTest stringByAppendingPathComponent:
[aLanguage stringByAppendingString:GSLanguagePSuffix]];
//NSDebugMLLog(@"bundles",@"pathTest=%@",pathTest);
pathTest=[pathTest stringByAppendingPathComponent:aName];
completePathTest=[bundlePath stringByAppendingPathComponent:pathTest];
fileManager=[NSFileManager defaultManager];
exists=[fileManager fileExistsAtPath:completePathTest];
#ifdef __APPLE__
if(!exists)
{
NSString *aCompletePath = [[[NSBundle bundleWithPath:bundlePath]
pathForResource:[aName stringByDeletingPathExtension]
ofType:[aName pathExtension]
inDirectory:aDirectory
forLocalization:aLanguage]
stringByResolvingSymlinksInPath];
if([aCompletePath length] >= ([bundlePath length] + 1))
{
exists = YES;
pathTest = [aCompletePath substringFromIndex:[bundlePath length] + 1];
}
}
#endif //__APPLE__
if (exists)
{
path=pathTest;
if (aLanguage)
[_relativePathsCache setObject:path
forKeys:aName,
(bundlePath ? bundlePath : emptyString),
(aDirectory ? aDirectory : emptyString),
(aLanguage ? aLanguage : emptyString),
nil];
else
[_relativePathsCache setObject:path
forKeys:aName,
(bundlePath ? bundlePath : emptyString),
(aDirectory ? aDirectory : emptyString),
nil];
}
else
{
if (aLanguage)
[_relativePathsCache setObject:GSNotFoundMarker
forKeys:aName,
(bundlePath ? bundlePath : emptyString),
(aDirectory ? aDirectory : emptyString),
(aLanguage ? aLanguage : emptyString),
nil];
else
[_relativePathsCache setObject:GSNotFoundMarker
forKeys:aName,
(bundlePath ? bundlePath : emptyString),
(aDirectory ? aDirectory : emptyString),
nil];
}
}
}
NS_HANDLER
{
localException=ExceptionByAddingUserInfoObjectFrameInfo0(localException,
@"lockedCachedRelativePathForResourceNamed:inDirectory:language:");
RETAIN(localException);
DESTROY(arp);
AUTORELEASE(localException);
[localException raise];
}
NS_ENDHANDLER;
RETAIN(path);
DESTROY(arp);
AUTORELEASE(path);
};
return path;
};
//--------------------------------------------------------------------
-(NSString*)lockedRelativePathForResourceNamed:(NSString*)aName
inDirectory:(NSString*)aDirectory
language:(NSString*)aLanguage
{
//OK
NSString* path=nil;
path=[self lockedCachedRelativePathForResourceNamed:aName
inDirectory:aDirectory
language:aLanguage];
return path;
};
//--------------------------------------------------------------------
/** Returns url for resource anmed aName for languages someLanguages **/
-(NSString*)urlForResourceNamed:(NSString*)aName
languages:(NSArray*)someLanguages
{
NSString* url=nil;
[self lock];
NS_DURING
{
NSString* relativePath=[self lockedRelativePathForResourceNamed:aName
languages:someLanguages];
url=[self lockedCachedURLForRelativePath:relativePath];
}
NS_HANDLER
{
//TODO
[self unlock];
[localException raise];
};
NS_ENDHANDLER;
[self unlock];
return url;
};
/** Returns the absolute path (cached or not) for relativePath. Put it in the cache
if it was not cached **/
-(NSString*)lockedCachedAbsolutePathForRelativePath:(NSString*)relativePath
{
NSString* path=nil;
if (relativePath)
{
// Test if already cached
path = [_absolutePathsCache objectForKey:relativePath];
// If not, build it
if (!path)
{
path=[[self bundlePath] stringByAppendingPathComponent:relativePath];
[_absolutePathsCache setObject:path
forKey:relativePath];
}
}
return path;
};
//--------------------------------------------------------------------
-(NSString*)absolutePathForRelativePath:(NSString*)relativePath
{
NSString* path=nil;
[self lock];
NS_DURING
{
path=[self lockedCachedAbsolutePathForRelativePath:relativePath];
}
NS_HANDLER
{
//TODO
[self unlock];
[localException raise];
};
NS_ENDHANDLER;
[self unlock];
return path;
}
//--------------------------------------------------------------------
-(NSString*)absolutePathForResourceNamed:(NSString*)aName
languages:(NSArray*)someLanguages
{
NSString* absolutePath=nil;
NSString* relativePath=nil;
relativePath = [self relativePathForResourceNamed:aName
languages:someLanguages];
absolutePath=[self absolutePathForRelativePath:relativePath];
return absolutePath;
}
//--------------------------------------------------------------------
/** Returns the url (cached or not) for relativePath. Put it in the cache
if it was not cached **/
-(NSString*)lockedCachedURLForRelativePath:(NSString*)relativePath
{
NSString* url=nil;
if (relativePath)
{
// Test if already cached
url = [_urlsCache objectForKey:relativePath];
// If not, build it
if (!url)
{
NSString* urlPrefix=[self bundleURLPrefix];
url=[urlPrefix stringByAppendingPathComponent:relativePath];
[_urlsCache setObject:url
forKey:relativePath];
};
}
return url;
};
//--------------------------------------------------------------------
// lock
-(void)lock
{
if (_selfLockn>0)
{
if (_selfLock_thread_id!=GSCurrentThread())
{
NSLog(@"PROBLEM: owner!=thread id");
};
};
LoggedLockBeforeDate(_selfLock,GSW_LOCK_LIMIT);
#ifndef NDEBUG
_selfLockn++;
_selfLock_thread_id=GSCurrentThread();
#endif
};
//--------------------------------------------------------------------
// unlock
-(void)unlock
{
if (_selfLockn>0)
{
if (_selfLock_thread_id!=GSCurrentThread())
{
NSLog(@"PROBLEM: owner!=thread id");
};
};
LoggedUnlock(_selfLock);
#ifndef NDEBUG
_selfLockn--;
if (_selfLockn==0)
_selfLock_thread_id=NULL;
#endif
};
//--------------------------------------------------------------------
+(id)bundleWithPath:(NSString*)aPath
{
id bundle=nil;
bundle=[[[GSWDeployedBundle alloc]initWithPath:aPath]autorelease];
return bundle;
};
@end