+2004-09-11 Helge Hess <helge.hess@opengroupware.org>
+
+ * removed JavaScript function support (v4.3.35)
+
2004-09-10 Helge Hess <helge.hess@skyrix.com>
* v4.3.34
WOAdaptor.m \
WOApplicationMain.m \
WOChildComponentReference.m \
- WOComponent+JS.m \
WOComponentRequestHandler.m \
WOCookie.m \
WOCoreApplication+Bundle.m \
WORequestHandler.m \
WOResourceRequestHandler.m \
WOServerSessionStore.m \
- WOSession+JS.m \
WOSimpleHTTPParser.m \
WOStats.m \
WOWatchDogApplicationMain.m \
}
-@end /* OWResourceManager */
-
-@implementation OWResourceManager(KeyedData)
+/* KeyedData */
- (void)setData:(NSData *)_data
forKey:(NSString *)_key
[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 */
# version file
-SUBMINOR_VERSION:=33
+SUBMINOR_VERSION:=35
# v4.2.413 requires libSaxObjC v4.2.33
# v4.2.341 requires libNGExtensions v4.2.77
#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) */
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
}
-@end /* WOResourceManager */
-
-@implementation WOResourceManager(KeyedData)
+/* KeyedData */
- (void)setData:(NSData *)_data
forKey:(NSString *)_key
[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 */
@end /* WOScriptedComponent */
-@implementation WOScriptedComponent(JSSupport)
-
-- (id)_jsfunc_FileManager:(NSArray *)_args {
- return [NSFileManager defaultManager];
-}
-
-@end /* WOScriptedComponent(JSSupport) */
-
@implementation NSObject(ScriptFunc)
- (BOOL)isScriptFunction {
+++ /dev/null
-/*
- 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 <NGObjWeb/NGObjWeb.h>
-
-/*
- 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) */
projects / sope / commitdiff