From b271fc4327cdd41e8e5944f5e166b4002bb6d8be Mon Sep 17 00:00:00 2001 From: helge Date: Fri, 10 Sep 2004 22:42:22 +0000 Subject: [PATCH] removed NGJavaScript support git-svn-id: http://svn.opengroupware.org/SOPE/trunk@130 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 4 + sope-appserver/NGObjWeb/GNUmakefile | 2 - sope-appserver/NGObjWeb/OWResourceManager.m | 31 +--- sope-appserver/NGObjWeb/Version | 2 +- sope-appserver/NGObjWeb/WOComponent+JS.m | 130 -------------- sope-appserver/NGObjWeb/WOResourceManager.m | 34 +--- sope-appserver/NGObjWeb/WOScriptedComponent.m | 8 - sope-appserver/NGObjWeb/WOSession+JS.m | 164 ------------------ 8 files changed, 12 insertions(+), 363 deletions(-) delete mode 100644 sope-appserver/NGObjWeb/WOSession+JS.m diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 1dc71591..d821cfb6 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,7 @@ +2004-09-11 Helge Hess + + * removed JavaScript function support (v4.3.35) + 2004-09-10 Helge Hess * v4.3.34 diff --git a/sope-appserver/NGObjWeb/GNUmakefile b/sope-appserver/NGObjWeb/GNUmakefile index c3b2af44..a37b3e48 100644 --- a/sope-appserver/NGObjWeb/GNUmakefile +++ b/sope-appserver/NGObjWeb/GNUmakefile @@ -106,7 +106,6 @@ libNGObjWeb_OBJC_FILES = \ WOAdaptor.m \ WOApplicationMain.m \ WOChildComponentReference.m \ - WOComponent+JS.m \ WOComponentRequestHandler.m \ WOCookie.m \ WOCoreApplication+Bundle.m \ @@ -125,7 +124,6 @@ libNGObjWeb_OBJC_FILES = \ WORequestHandler.m \ WOResourceRequestHandler.m \ WOServerSessionStore.m \ - WOSession+JS.m \ WOSimpleHTTPParser.m \ WOStats.m \ WOWatchDogApplicationMain.m \ diff --git a/sope-appserver/NGObjWeb/OWResourceManager.m b/sope-appserver/NGObjWeb/OWResourceManager.m index d0a13714..7486fd8e 100644 --- a/sope-appserver/NGObjWeb/OWResourceManager.m +++ b/sope-appserver/NGObjWeb/OWResourceManager.m @@ -1122,9 +1122,7 @@ _pathExists(OWResourceManager *self, NSFileManager *fm, NSString *path) } -@end /* OWResourceManager */ - -@implementation OWResourceManager(KeyedData) +/* KeyedData */ - (void)setData:(NSData *)_data forKey:(NSString *)_key @@ -1192,29 +1190,4 @@ _pathExists(OWResourceManager *self, NSFileManager *fm, NSString *path) [self unlock]; } -@end /* OWResourceManager(KeyedData) */ - -@implementation OWResourceManager(JavaScript) - -- (id)_jsfunc_pathForResourceNamed:(NSArray *)_args { - unsigned argc = [_args count]; - - return [self pathForResourceNamed: - argc > 0 ? [_args objectAtIndex:0] : nil - inFramework:argc > 1 ? [_args objectAtIndex:1] : nil - languages:argc > 2 ? [_args objectAtIndex:2] : nil]; -} - -- (id)_jsfunc_loadPropertyListNamed:(NSArray *)_args { - NSString *s; - - if ((s = [self _jsfunc_pathForResourceNamed:_args]) == nil) - return nil; - - if ((s = [NSString stringWithContentsOfFile:s]) == nil) - return nil; - - return [s propertyList]; -} - -@end /* OWResourceManager(JavaScript) */ +@end /* OWResourceManager */ diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index 8ee1ad73..4cbc04b6 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=33 +SUBMINOR_VERSION:=35 # v4.2.413 requires libSaxObjC v4.2.33 # v4.2.341 requires libNGExtensions v4.2.77 diff --git a/sope-appserver/NGObjWeb/WOComponent+JS.m b/sope-appserver/NGObjWeb/WOComponent+JS.m index ab777e00..45a4abc4 100644 --- a/sope-appserver/NGObjWeb/WOComponent+JS.m +++ b/sope-appserver/NGObjWeb/WOComponent+JS.m @@ -77,133 +77,3 @@ static NSNumber *nNo = nil; #endif @end /* WOComponent(JSKVC) */ - -@implementation WOComponent(JSFunctions) - -- (id)_jsfunc_reset:(NSArray *)_args { - [self reset]; - return self; -} - -- (id)_jsfunc_pageWithName:(NSArray *)_args { - return [self pageWithName:[[_args objectAtIndex:0] stringValue]]; -} -- (id)_jsfunc_templateWithName:(NSArray *)_args { - return [self templateWithName:[[_args objectAtIndex:0] stringValue]]; -} -- (id)_jsfunc_performParentAction:(NSArray *)_args { - return [self performParentAction:[[_args objectAtIndex:0] stringValue]]; -} - -- (id)_jsfunc_canGetValueForBinding:(NSArray *)_args { - ENSURE_BOOLNUMS; - return [self canGetValueForBinding:[[_args objectAtIndex:0] stringValue]] - ? nYes : nNo; -} -- (id)_jsfunc_canSetValueForBinding:(NSArray *)_args { - ENSURE_BOOLNUMS; - return [self canSetValueForBinding:[[_args objectAtIndex:0] stringValue]] - ? nYes : nNo; -} - -- (id)_jsfunc_setValueForBinding:(NSArray *)_args { - [self setValue:[_args objectAtIndex:0] - forBinding:[[_args objectAtIndex:1] stringValue]]; - return self; -} -- (id)_jsfunc_valueForBinding:(NSArray *)_args { - return [self valueForBinding:[[_args objectAtIndex:0] stringValue]]; -} - -- (id)_jsfunc_hasBinding:(NSArray *)_args { - ENSURE_BOOLNUMS; - return [self hasBinding:[[_args objectAtIndex:0] stringValue]] - ? nYes : nNo; -} - -- (id)_jsfunc_getResourceManager:(NSArray *)_args { - return [self resourceManager]; -} - -- (id)_jsfunc_print:(NSArray *)_args { - NSEnumerator *e; - id o; - BOOL isFirst; - NSMutableString *ms; - - isFirst = YES; - ms = [NSMutableString stringWithCapacity:128]; - - e = [_args objectEnumerator]; - while ((o = [e nextObject])) { - NSString *s; - - if (!isFirst) [ms appendString:@" "]; - else isFirst = NO; - - s = [o stringValue]; - [ms appendString:s]; - } - - [self logWithFormat:@"%@", ms]; - - return self; -} - -@end /* WOComponent(JSFunctions) */ - -@implementation WOComponent(JSProperties) - -- (id)_jsprop_sessionID { - return [[self session] sessionID]; -} -- (id)_jsprop_name { - return [self name]; -} -- (id)_jsprop_path { - return [self path]; -} -- (id)_jsprop_baseURL { - return [self baseURL]; -} - -- (id)_jsprop_context { - return [self context]; -} -- (id)_jsprop_session { - return [self session]; -} -- (id)_jsprop_application { - return [self application]; -} -- (id)_jsprop_parent { - return [self parent]; -} - -- (id)_jsprop_hasSession { - ENSURE_BOOLNUMS; - return [self hasSession] ? nYes : nNo; -} - -- (void)_jsprop_cachingEnabled:(id)_value { - [self setCachingEnabled:[_value boolValue]]; -} -- (id)_jsprop_cachingEnabled { - ENSURE_BOOLNUMS; - return [self isCachingEnabled] ? nYes : nNo; -} - -- (id)_jsprop_isEventLoggingEnabled { - ENSURE_BOOLNUMS; - return [self isEventLoggingEnabled] ? nYes : nNo; -} -- (id)_jsprop_isStateless { - ENSURE_BOOLNUMS; - return [self isStateless] ? nYes : nNo; -} -- (id)_jsprop_synchronizedVariablesWithBindings { - ENSURE_BOOLNUMS; - return [self synchronizesVariablesWithBindings] ? nYes : nNo; -} - -@end /* WOComponent(JSProperties) */ diff --git a/sope-appserver/NGObjWeb/WOResourceManager.m b/sope-appserver/NGObjWeb/WOResourceManager.m index 8133b66b..d53cc2b3 100644 --- a/sope-appserver/NGObjWeb/WOResourceManager.m +++ b/sope-appserver/NGObjWeb/WOResourceManager.m @@ -67,6 +67,9 @@ but .wo ones in just Resources. This issue should be fixed in recent woapp-gs.make ... + + Update: since for SOPE 4.3 we only work with gstep-make 1.10, this seems to + be fixed? */ #if COCOA_Foundation_LIBRARY || NeXT_Foundation_LIBRARY # define RSRCDIR_CONTENTS 1 @@ -1037,9 +1040,7 @@ _pathExists(WOResourceManager *self, NSFileManager *fm, NSString *path) } -@end /* WOResourceManager */ - -@implementation WOResourceManager(KeyedData) +/* KeyedData */ - (void)setData:(NSData *)_data forKey:(NSString *)_key @@ -1107,29 +1108,4 @@ _pathExists(WOResourceManager *self, NSFileManager *fm, NSString *path) [self unlock]; } -@end /* WOResourceManager(KeyedData) */ - -@implementation WOResourceManager(JavaScript) - -- (id)_jsfunc_pathForResourceNamed:(NSArray *)_args { - unsigned argc = [_args count]; - - return [self pathForResourceNamed: - argc > 0 ? [_args objectAtIndex:0] : nil - inFramework:argc > 1 ? [_args objectAtIndex:1] : nil - languages:argc > 2 ? [_args objectAtIndex:2] : nil]; -} - -- (id)_jsfunc_loadPropertyListNamed:(NSArray *)_args { - NSString *s; - - if ((s = [self _jsfunc_pathForResourceNamed:_args]) == nil) - return nil; - - if ((s = [NSString stringWithContentsOfFile:s]) == nil) - return nil; - - return [s propertyList]; -} - -@end /* WOResourceManager(JavaScript) */ +@end /* WOResourceManager */ diff --git a/sope-appserver/NGObjWeb/WOScriptedComponent.m b/sope-appserver/NGObjWeb/WOScriptedComponent.m index 6930dd15..f1869710 100644 --- a/sope-appserver/NGObjWeb/WOScriptedComponent.m +++ b/sope-appserver/NGObjWeb/WOScriptedComponent.m @@ -254,14 +254,6 @@ static BOOL logScriptDealloc = NO; @end /* WOScriptedComponent */ -@implementation WOScriptedComponent(JSSupport) - -- (id)_jsfunc_FileManager:(NSArray *)_args { - return [NSFileManager defaultManager]; -} - -@end /* WOScriptedComponent(JSSupport) */ - @implementation NSObject(ScriptFunc) - (BOOL)isScriptFunction { diff --git a/sope-appserver/NGObjWeb/WOSession+JS.m b/sope-appserver/NGObjWeb/WOSession+JS.m deleted file mode 100644 index d5a84ac7..00000000 --- a/sope-appserver/NGObjWeb/WOSession+JS.m +++ /dev/null @@ -1,164 +0,0 @@ -/* - Copyright (C) 2000-2003 SKYRIX Software AG - - This file is part of OGo - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo 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 Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. -*/ -// $Id$ - -#include "common.h" -#include - -/* - WOSession JavaScript object - - Properties - - String sessionID - String domainForIDCookies - Date expirationDateForIDCookies - bool isDistributionEnabled - bool isTerminating - Array languages - Object statistics - Number timeOut - bool storesIDsInCookies - bool storesIDsInURLs - - Methods - - WOComponent restorePageForContextID(ctxid) - savePage(page) - savePageInPermanentCache(page) - terminate() - print(string [,..string]) -*/ - -static NSNumber *nYes = nil; -static NSNumber *nNo = nil; - -@implementation WOSession(JSFunctions) - -- (id)_jsfunc_restorePageForContextID:(NSArray *)_args { - return [self restorePageForContextID:[[_args objectAtIndex:0] stringValue]]; -} -- (id)_jsfunc_savePage:(NSArray *)_args { - [self savePage:[_args objectAtIndex:0]]; - return self; -} -- (id)_jsfunc_savePageInPermanentCache:(NSArray *)_args { - [self savePageInPermanentCache:[_args objectAtIndex:0]]; - return self; -} -- (id)_jsfunc_terminate:(NSArray *)_args { - [self terminate]; - return self; -} - -- (id)_jsfunc_print:(NSArray *)_args { - NSEnumerator *e; - id o; - BOOL isFirst; - NSMutableString *ms; - - isFirst = YES; - ms = [NSMutableString stringWithCapacity:128]; - - e = [_args objectEnumerator]; - while ((o = [e nextObject])) { - NSString *s; - - if (!isFirst) [ms appendString:@" "]; - else isFirst = NO; - - s = [o stringValue]; - [ms appendString:s]; - } - - [self logWithFormat:@"%@", ms]; - - return self; -} - -@end - -@implementation WOSession(JSProperties) - -+ (void)initialize { - if (nYes == nil) nYes = [[NSNumber alloc] initWithBool:YES]; - if (nNo == nil) nNo = [[NSNumber alloc] initWithBool:NO]; -} - -- (id)_jsprop_sessionID { - return [self sessionID]; -} -- (id)_jsprop_domainForIDCookies { - return [self domainForIDCookies]; -} -- (id)_jsprop_expirationDateForIDCookies { - return [self expirationDateForIDCookies]; -} - -- (id)_jsprop_isDistributionEnabled:(id)_value { - [self setDistributionEnabled:[_value boolValue]]; - return self; -} -- (id)_jsprop_isDistributionEnabled { - return [self isDistributionEnabled] ? nYes : nNo; -} - -- (id)_jsprop_isTerminating { - return [self isTerminating] ? nYes : nNo; -} - -- (id)_jsprop_languages:(id)_value { - [self setLanguages:_value]; - return self; -} -- (id)_jsprop_languages { - return [self languages]; -} - -- (id)_jsprop_statistics { - return [self statistics]; -} - -- (id)_jsprop_timeOut:(id)_value { - [self setTimeOut:[_value doubleValue]]; - return self; -} -- (id)_jsprop_timeOut { - return [NSNumber numberWithDouble:[self timeOut]]; -} - -- (id)_jsprop_storesIDsInCookies:(id)_value { - [self setStoresIDsInCookies:[_value boolValue]]; - return self; -} -- (id)_jsprop_storesIDsInCookies { - return [self storesIDsInCookies] ? nYes : nNo; -} - -- (id)_jsprop_storesIDsInURLs:(id)_value { - [self setStoresIDsInURLs:[_value boolValue]]; - return self; -} -- (id)_jsprop_storesIDsInURLs { - return [self storesIDsInURLs] ? nYes : nNo; -} - -@end /* WOSession(JSProperties) */ -- 2.39.5