* GSWeb/GSWSessionTimeOutManager.m

shorten description to avoid loop
	* GSWeb/GSWApplication.m
	  added -frameworkNameWOExtensions to make WONames work
	  (Session restoration error page did not work)
	* GSWDatabase/WODisplayGroup.m
	  added <WebObjects/GSWPrivate.h> header
This commit is contained in:
David Wetzel 2017-09-02 13:29:07 -04:00
parent 5a7b2ec8c8
commit 86a7e29d4b
4 changed files with 29 additions and 10 deletions

View file

@ -1,3 +1,11 @@
2017-09-02 David Wetzel <dave@turbocat.de>
* GSWeb/GSWSessionTimeOutManager.m
shorten description to avoid loop
* GSWeb/GSWApplication.m
added -frameworkNameWOExtensions to make WONames work
(Session restoration error page did not work)
* GSWDatabase/WODisplayGroup.m
added <WebObjects/GSWPrivate.h> header
2015-03-11 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb/GSWConstants.m
downcase Header keys

View file

@ -42,7 +42,7 @@
#include <WebObjects/WebObjects.h>
#include <EOControl/EOSortOrdering.h>
#include <EOControl/EOClassDescription.h>
#include <GSWeb/GSWPrivate.h>
#include <WebObjects/GSWPrivate.h>
static NSArray* globalStringQualifierOperators=nil;
static NSArray* globalAllQualifierOperators=nil;

View file

@ -3666,10 +3666,18 @@ to another instance **/
// or [GSWDynamicURLString stringWithString:url]
// instead.
// we need BOTH of those frameworkNameXX methods otherwise either GSWNames or WONames will fail -- dwetzel
// Returns GSWExtensions or WOExtensions
- (NSString*)frameworkNameGSWExtensions
{
return GSWFramework_extensions[GSWebNamingConv];
}
- (NSString*)frameworkNameWOExtensions
{
return GSWFramework_extensions[GSWebNamingConv];
}
@end

View file

@ -545,15 +545,18 @@
- (NSString*) description
{
NSString * desStr = [NSString stringWithFormat:@"<%s %p sessionOrderedTimeOuts:%@ sessionTimeOuts:%@ target:XX callback:%@ timer:%@ selfLock:%@>", object_getClassName(self),
(void*)self,
_sessionOrderedTimeOuts,
_sessionTimeOuts,
//_target
NSStringFromSelector(_callback),
_timer,
_selfLock
];
NSString * desStr = [NSString stringWithFormat:@"<%s %p>", object_getClassName(self),
(void*)self];
// NSString * desStr = [NSString stringWithFormat:@"<%s %p sessionOrderedTimeOuts:%@ sessionTimeOuts:%@ target:XX callback:%@ timer:%@ selfLock:%@>", object_getClassName(self),
// (void*)self,
// _sessionOrderedTimeOuts,
// _sessionTimeOuts,
// //_target
// NSStringFromSelector(_callback),
// _timer,
// _selfLock
// ];
return desStr;
}