GSWeb.framework: GSWApplication.m GSWConstants.h GSWConstants.m
		Added GSWClassName_ResourceManager, GSWClassName_StatisticsStore,
		GSWClassName_ServerSessionStore
		Joined broken lines with string constants in GSWApplication.m


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@18274 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
uid66623 2003-12-26 00:36:38 +00:00
parent ba114d2adc
commit 5881be0b15
3 changed files with 17 additions and 10 deletions

View file

@ -1896,8 +1896,9 @@ selfLockn,
{
NSString* resourceManagerClassName=[[self class] resourceManagerClassName];
Class resourceManagerClass=Nil;
if (!resourceManagerClassName)
resourceManagerClassName=@"GSWResourceManager";
if (!resourceManagerClassName) {
resourceManagerClassName=GSWClassName_ResourceManager[GSWebNamingConv];
}
resourceManagerClass=NSClassFromString(resourceManagerClassName);
NSAssert1(resourceManagerClass,@"No resourceManagerClass named %@",
resourceManagerClassName);
@ -1909,8 +1910,9 @@ selfLockn,
{
NSString* statisticsStoreClassName=[[self class] statisticsStoreClassName];
Class statisticsStoreClass=Nil;
if (!statisticsStoreClassName)
statisticsStoreClassName=@"GSWStatisticsStore";
if (!statisticsStoreClassName) {
statisticsStoreClassName=GSWClassName_StatisticsStore[GSWebNamingConv];
}
statisticsStoreClass=NSClassFromString(statisticsStoreClassName);
NSAssert1(statisticsStoreClass,@"No statisticsStoreClass named %@",
statisticsStoreClassName);
@ -1922,8 +1924,9 @@ selfLockn,
{
NSString* sessionStoreClassName=[[self class] sessionStoreClassName];
Class sessionStoreClass=Nil;
if (!sessionStoreClassName)
sessionStoreClassName=@"GSWServerSessionStore";
if (!sessionStoreClassName) {
sessionStoreClassName=GSWClassName_ServerSessionStore[GSWebNamingConv];
}
sessionStoreClass=NSClassFromString(sessionStoreClassName);
NSAssert1(sessionStoreClass,@"No sessionStoreClass named %@",
sessionStoreClassName);
@ -3507,8 +3510,7 @@ to another instance **/
NS_HANDLER
{
localException=ExceptionByAddingUserInfoObjectFrameInfo0(localException,
@"In _handleExcep
tion:inContext:");
@"In _handleException:inContext:");
LOGException(@"exception=%@",localException);
response=[GSWResponse responseWithMessage:@"Exception Handling failed"
inContext:aContext
@ -3516,8 +3518,7 @@ tion:inContext:");
}
NS_ENDHANDLER;
NSAssert(![response isFinalizeInContextHasBeenCalled],
@"GSWApplication handleException: _finalizeInContext called for GSWRe
sponse");
@"GSWApplication handleException: _finalizeInContext called for GSWResponse");
LOGObjectFnStop();
return response;
};

View file

@ -91,6 +91,9 @@ extern NSString* GSWAPIPSuffix;
extern NSString* GSWClassName_Session;
extern NSString* GSWClassName_Application;
extern NSString* GSWClassName_ResourceManager[2];
extern NSString* GSWClassName_StatisticsStore[2];
extern NSString* GSWClassName_ServerSessionStore[2];
extern NSString* GSWClassName_DefaultAdaptor[2];
extern NSString* GSWClassName_DefaultContext[2];
extern NSString* GSWClassName_DefaultResponse[2];

View file

@ -87,6 +87,9 @@ NSString* GSWMainPageName=@"Main";
NSString* GSWClassName_Session=@"Session";
NSString* GSWClassName_Application=@"Application";
NSString* GSWClassName_ResourceManager[2]={ @"GSWResourceManager", @"WOResourceManager" };
NSString* GSWClassName_StatisticsStore[2]={ @"GSWStatisticsStore", @"WOStatisticsStore" };
NSString* GSWClassName_ServerSessionStore[2]={ @"GSWServerSessionStore", @"WOServerSessionStore" };
NSString* GSWClassName_DefaultAdaptor[2]={ @"GSWDefaultAdaptor", @"WODefaultAdaptor" };
NSString* GSWClassName_DefaultContext[2]={ @"GSWContext", @"WOContext" };
NSString* GSWClassName_DefaultResponse[2]={ @"GSWResponse", @"WOResponse" };