From 34b4de0a5c91ddf51146037010d408f6b2354fdb Mon Sep 17 00:00:00 2001 From: helge Date: Fri, 20 Aug 2004 21:07:18 +0000 Subject: [PATCH] fixed NGObjWeb for SOPE 3.3 git-svn-id: http://svn.opengroupware.org/SOPE/trunk@14 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- README | 30 ++- .../Associations/GNUmakefile.preamble | 6 +- sope-appserver/NGObjWeb/Associations/common.h | 33 +++ sope-appserver/NGObjWeb/ChangeLog | 8 + .../DynamicElements/GNUmakefile.preamble | 9 +- .../NGObjWeb/DynamicElements/WOFileUpload.m | 191 +++++++++--------- .../NGObjWeb/DynamicElements/common.h | 1 - sope-appserver/NGObjWeb/GNUmakefile.preamble | 41 ++-- sope-appserver/NGObjWeb/NGHttp+WO.m | 1 + .../NGObjWeb/NGHttp/GNUmakefile.preamble | 7 +- .../NGObjWeb/NGXmlRpc/GNUmakefile.preamble | 8 +- .../NGObjWeb/NGXmlRpc/NGXmlRpcClient.m | 2 + sope-appserver/NGObjWeb/NGXmlRpc/common.h | 23 +++ sope-appserver/NGObjWeb/SNSConnection.m | 2 + .../NGObjWeb/SoOFS/GNUmakefile.preamble | 8 +- .../NGObjWeb/SoObjects/GNUmakefile.preamble | 8 +- sope-appserver/NGObjWeb/SoObjects/common.h | 24 +++ .../NGObjWeb/Templates/GNUmakefile.preamble | 8 +- sope-appserver/NGObjWeb/Templates/common.h | 33 +++ sope-appserver/NGObjWeb/Version | 2 +- sope-appserver/NGObjWeb/WOCoreApplication.m | 2 + .../WOHttpAdaptor/GNUmakefile.preamble | 9 +- .../NGObjWeb/WOHttpAdaptor/common.h | 26 +++ .../NGObjWeb/WebDAV/GNUmakefile.preamble | 10 +- .../NGObjWeb/WebDAV/SoSubscription.m | 6 +- sope-appserver/NGObjWeb/WebDAV/common.h | 23 +++ sope-appserver/NGObjWeb/common.h | 8 +- sope-appserver/NGObjWeb/ngobjweb.make | 9 +- sope-appserver/NGObjWeb/xmlrpc_call.m | 20 +- sope-appserver/common.make | 16 +- sope-core/samples/common.h | 1 - sope-ldap/GNUmakefile | 2 +- 32 files changed, 388 insertions(+), 189 deletions(-) create mode 100644 sope-appserver/NGObjWeb/Associations/common.h create mode 100644 sope-appserver/NGObjWeb/NGXmlRpc/common.h create mode 100644 sope-appserver/NGObjWeb/SoObjects/common.h create mode 100644 sope-appserver/NGObjWeb/Templates/common.h create mode 100644 sope-appserver/NGObjWeb/WOHttpAdaptor/common.h create mode 100644 sope-appserver/NGObjWeb/WebDAV/common.h diff --git a/README b/README index 1fa35788..ec5c18f2 100644 --- a/README +++ b/README @@ -6,14 +6,7 @@ SKYRiX Object Publishing Environment This directory contains SOPE, the application server hosting the OpenGroupware.org business logic and web interface. -mod_ngobjweb -============ - -An Apache module for forwarding HTTP request from Apache to a SOPE -application server. This is a non-streaming proxy so that the application -server isn't blocked by IO of slow connections ! -(this eliminates the need for threading because of IO, the Apache server - pool runs the blocking IO operations) +SOPE 4.3 is the development version of the upcoming SOPE 4.4 release. SKYRiX Libraries for XML Processing (sope-xml) ============================================== @@ -31,10 +24,22 @@ SKYRiX Core Libraries (sope-core) The SKYRiX Core libraries (sope-core) contain: - various Foundation extensions - a java.io like stream and socket library + +SKYRiX MIME Libraries (sope-mime) +================================= + - classes for processing MIME entities - a full IMAP4 implementation - prototypical POP3 and SMTP processors + +SKYRiX LDAP Libraries (sope-ldap) +================================= + - an Objective-C wrapper for LDAP directory services + +SKYRiX iCalendar Libraries (sope-ical) +====================================== + - classes for iCalendar/vCard objects SKYRiX Application Server (SOPE) @@ -52,3 +57,12 @@ It provides - session management - scripting extensions for Foundation, JavaScript bridge - DOM tree rendering library + +mod_ngobjweb +============ + +An Apache module for forwarding HTTP request from Apache to a SOPE +application server. This is a non-streaming proxy so that the application +server isn't blocked by IO of slow connections! +(this eliminates the need for threading because of IO, the Apache server + pool runs the blocking IO operations) diff --git a/sope-appserver/NGObjWeb/Associations/GNUmakefile.preamble b/sope-appserver/NGObjWeb/Associations/GNUmakefile.preamble index 0f9aea93..6c40b404 100644 --- a/sope-appserver/NGObjWeb/Associations/GNUmakefile.preamble +++ b/sope-appserver/NGObjWeb/Associations/GNUmakefile.preamble @@ -2,9 +2,9 @@ ADDITIONAL_INCLUDE_DIRS += \ -I.. \ - -I../../../skyrix-core \ - -I../../../skyrix-core/NGStreams \ - -I../../../skyrix-core/NGExtensions \ + -I../../../sope-core \ + -I../../../sope-core/NGStreams \ + -I../../../sope-core/NGExtensions \ ifeq ($(WOAssociationExceptionHandlers),yes) ADDITIONAL_CPPFLAGS += -DUSE_EXCEPTION_HANDLERS=1 diff --git a/sope-appserver/NGObjWeb/Associations/common.h b/sope-appserver/NGObjWeb/Associations/common.h new file mode 100644 index 00000000..0ebf13ff --- /dev/null +++ b/sope-appserver/NGObjWeb/Associations/common.h @@ -0,0 +1,33 @@ +/* + Copyright (C) 2000-2004 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + 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. +*/ + +#import + +#if !LIB_FOUNDATION_LIBRARY +# include +# include +#endif + +#include + +#define IS_DEPRECATED \ + NSLog(@"WARNING: used deprecated method: %s:%i.", \ + __PRETTY_FUNCTION__, __LINE__); diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 191f641f..770c449c 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,5 +1,13 @@ 2004-08-20 Helge Hess + * v4.3.2 + + * removed dependency on NGJavaScript + + * DynamicElements/WOFileUpload.m: code cleanups + + * fixed for SOPE 3.3 directory layout + * moved to SOPE 4.3, restarted subminor version to 1 to remove special MacOSX version (v4.3.1) diff --git a/sope-appserver/NGObjWeb/DynamicElements/GNUmakefile.preamble b/sope-appserver/NGObjWeb/DynamicElements/GNUmakefile.preamble index ff6a033f..b540adce 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/GNUmakefile.preamble +++ b/sope-appserver/NGObjWeb/DynamicElements/GNUmakefile.preamble @@ -9,7 +9,8 @@ ADDITIONAL_CPPFLAGS += -DCOMPILING_NGOBJWEB=1 DynamicElements_INCLUDE_DIRS += \ -I.. -I. -I../.. \ - -I../../../skyrix-core \ - -I../../../skyrix-core/NGStreams \ - -I../../../skyrix-core/NGExtensions \ - -I../../../skyrix-xml + -I../../../sope-core \ + -I../../../sope-core/NGStreams \ + -I../../../sope-core/NGExtensions \ + -I../../../sope-mime \ + -I../../../sope-xml diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m b/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m index d52f5cd0..cbf8af6d 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m @@ -1,7 +1,7 @@ /* - Copyright (C) 2000-2003 SKYRIX Software AG + Copyright (C) 2000-2004 SKYRIX Software AG - This file is part of OGo + This file is part of OpenGroupware.org. 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 @@ -18,12 +18,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #include "WOInput.h" -#include "common.h" -#import -#import @interface WOFileUpload : WOInput { @@ -39,6 +35,10 @@ @end /* WOFileUpload */ +#include "common.h" +#include +#include + @interface WORequest(UsedPrivates) - (id)httpRequest; @end @@ -68,122 +68,129 @@ static NGMimeType *multipartFormData = nil; return self; } -#if !LIB_FOUNDATION_BOEHM_GC - (void)dealloc { - RELEASE(self->filePath); self->filePath = nil; - RELEASE(self->data); self->data = nil; + [self->filePath release]; + [self->data release]; [super dealloc]; } -#endif -// ******************** responder ******************** +/* handling requests */ -- (void)takeValuesFromRequest:(WORequest *)_request - inContext:(WOContext *)_ctx -{ - if (![self->disabled boolValueInComponent:[_ctx component]]) { - NSString *currentId; - id formValue = nil; +- (void)takeValuesFromRequest:(WORequest *)_rq inContext:(WOContext *)_ctx { + NGMimeMultipartBody *body; + NGMimeType *contentType; + NSString *currentId; + id formValue = nil; + NSArray *parts; + unsigned i, count; + + if ([self->disabled boolValueInComponent:[_ctx component]]) + return; - currentId = OWFormElementName(self, _ctx); + currentId = OWFormElementName(self, _ctx); - formValue = [_request formValueForKey:currentId]; - if (formValue) { - NGMimeType *contentType = [[_request httpRequest] contentType]; + if ((formValue = [_rq formValueForKey:currentId]) == nil) + return; + + contentType = [[_rq httpRequest] contentType]; - if (![contentType hasSameType:multipartFormData]) { - NSLog(@"WARNING: tried to apply file-upload value of %@ from " - @"a non multipart-form request (value=%@) !", - [_ctx elementID], formValue); - return; - } + if (![contentType hasSameType:multipartFormData]) { + NSLog(@"WARNING: tried to apply file-upload value of %@ from " + @"a non multipart-form request (value=%@) !", + [_ctx elementID], formValue); + return; + } - //NSLog(@"%@: value=%@ ..", [self elementID], formValue); - - if ([self->data isValueSettable]) - [self->data setValue:formValue inComponent:[_ctx component]]; - - if ([self->filePath isValueSettable]) { - NGMimeMultipartBody *body = [[_request httpRequest] body]; +#if 0 + NSLog(@"%@: value=%@ ..", [self elementID], formValue); +#endif - if ([body isKindOfClass:[NGMimeMultipartBody class]]) { - NSArray *parts = [body parts]; - unsigned i, count = [parts count]; + if ([self->data isValueSettable]) + [self->data setValue:formValue inComponent:[_ctx component]]; - // search for part of current form element - - for (i = 0; i < count; i++) { - id disposition; - id bodyPart; - - bodyPart = [parts objectAtIndex:i]; - disposition = - [[bodyPart valuesOfHeaderFieldWithName:@"content-disposition"] - nextObject]; + if (![self->filePath isValueSettable]) + return; + + body = [[_rq httpRequest] body]; + if (![body isKindOfClass:[NGMimeMultipartBody class]]) + /* TODO: shouldn't we log something? */ + return; + + /* search for part of current form element */ + + parts = [body parts]; + for (i = 0, count = [parts count]; i < count; i++) { + static Class DispClass = Nil; + NSString *formName; + id disposition; + id bodyPart; - if (disposition) { - static Class DispClass = Nil; - NSString *formName; + bodyPart = [parts objectAtIndex:i]; + disposition = [[bodyPart valuesOfHeaderFieldWithName: + @"content-disposition"] nextObject]; + + if (disposition == nil) + continue; + + if (DispClass == Nil) + DispClass = [NGMimeContentDispositionHeaderField class]; - if (DispClass == Nil) - DispClass = [NGMimeContentDispositionHeaderField class]; - - if (![disposition isKindOfClass:DispClass]) { - disposition = - [[DispClass alloc] initWithString:[disposition stringValue]]; - AUTORELEASE(disposition); - } - - formName = - [(NGMimeContentDispositionHeaderField *)disposition name]; + if (![disposition isKindOfClass:DispClass]) { + disposition = + [[DispClass alloc] initWithString:[disposition stringValue]]; + disposition = [disposition autorelease]; + } - if ([formName isEqualToString:currentId]) { - [self->filePath - setValue:[disposition filename] - inComponent:[_ctx component]]; - break; - } - } - } - } - } + formName = [(NGMimeContentDispositionHeaderField *)disposition name]; + + if ([formName isEqualToString:currentId]) { + [self->filePath setValue:[disposition filename] + inComponent:[_ctx component]]; + break; } } } +/* generating response */ + - (void)appendToResponse:(WOResponse *)_response inContext:(WOContext *)_ctx { - if (![[_ctx request] isFromClientComponent]) { - NSString *v = [self->value stringValueInComponent:[_ctx component]]; + NSString *v; + + if ([[_ctx request] isFromClientComponent]) + return; + + v = [self->value stringValueInComponent:[_ctx component]]; - WOResponse_AddCString(_response, "otherTagString) { - WOResponse_AddString(_response, - [self->otherTagString stringValueInComponent: + if (self->otherTagString) { + WOResponse_AddString(_response, + [self->otherTagString stringValueInComponent: [_ctx component]]); - } - WOResponse_AddCString(_response, " />"); } + WOResponse_AddCString(_response, " />"); } /* description */ - (NSString *)associationDescription { - NSMutableString *str = [[NSMutableString alloc] init]; + NSMutableString *str; + + str = [NSMutableString stringWithCapacity:32]; [str appendString:[super associationDescription]]; - - if (self->filePath) [str appendFormat:@" path=%@", self->filePath]; - if (self->data) [str appendFormat:@" data=%@", self->data]; - - return AUTORELEASE(str); + + if (self->filePath != nil) [str appendFormat:@" path=%@", self->filePath]; + if (self->data != nil) [str appendFormat:@" data=%@", self->data]; + + return str; } @end /* WOFileUpload */ diff --git a/sope-appserver/NGObjWeb/DynamicElements/common.h b/sope-appserver/NGObjWeb/DynamicElements/common.h index 4d60bf7b..1b73c1b3 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/common.h +++ b/sope-appserver/NGObjWeb/DynamicElements/common.h @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #ifndef __NGObjWeb_DynElem_common_H__ #define __NGObjWeb_DynElem_common_H__ diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble index 3c1576a3..1df229c4 100644 --- a/sope-appserver/NGObjWeb/GNUmakefile.preamble +++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble @@ -7,21 +7,20 @@ ADDITIONAL_INCLUDE_DIRS += \ -I./DynamicElements/ \ -I./Templates/ \ -I.. \ - -I../../skyrix-core \ - -I../../skyrix-core/NGStreams/ \ - -I../../skyrix-core/NGExtensions + -I../../sope-core \ + -I../../sope-core/NGStreams/ \ + -I../../sope-core/NGExtensions \ + -I../../sope-mime libNGObjWeb_OBJCFLAGS += -Wall -Wno-import -Wno-protocol ifneq ($(GNUSTEP_BUILD_DIR),) -RELBUILD_DIR_JS=$(GNUSTEP_BUILD_DIR)/../../../ThirdParty/js-1.5 RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/.. -RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../../skyrix-core -RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../skyrix-xml +RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../../sope-core +RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml ADDITIONAL_LIB_DIRS += \ -L$(GNUSTEP_OBJ_DIR) \ - -L$(RELBUILD_DIR_SOPE)/NGJavaScript/$(GNUSTEP_OBJ_DIR_NAME) \ -L$(RELBUILD_DIR_SOPE)/NGScripting/$(GNUSTEP_OBJ_DIR_NAME) \ -L$(RELBUILD_DIR_SxCore)/NGMime/$(GNUSTEP_OBJ_DIR_NAME) \ -L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME) \ @@ -35,39 +34,37 @@ ADDITIONAL_LIB_DIRS += \ else libNGObjWeb_LIB_DIRS += \ -L./$(GNUSTEP_OBJ_DIR) \ - -L../NGJavaScript/$(GNUSTEP_OBJ_DIR) \ -L../NGScripting/$(GNUSTEP_OBJ_DIR) \ - -L../../skyrix-core/NGMime/$(GNUSTEP_OBJ_DIR) \ - -L../../skyrix-core/NGStreams/$(GNUSTEP_OBJ_DIR) \ - -L../../skyrix-core/NGExtensions/$(GNUSTEP_OBJ_DIR) \ - -L../../skyrix-core/EOControl/$(GNUSTEP_OBJ_DIR) \ - -L../../skyrix-xml/XmlRpc/$(GNUSTEP_OBJ_DIR) \ - -L../../skyrix-xml/DOM/$(GNUSTEP_OBJ_DIR) \ - -L../../skyrix-xml/SaxObjC/$(GNUSTEP_OBJ_DIR) + -L../../sope-mime/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-xml/XmlRpc/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR) endif libNGObjWeb_LIBRARIES_DEPEND_UPON += \ - -lNGJavaScript -lNGScripting \ + -lNGScripting \ -lNGMime -lNGStreams -lNGExtensions -lEOControl \ - -lXmlRpc -lDOM -lSaxObjC \ - -ljs + -lXmlRpc -lDOM -lSaxObjC wod_LIB_DIRS += $(libNGObjWeb_LIB_DIRS) wod_TOOL_LIBS += \ - -lNGObjWeb -lNGJavaScript -lNGScripting \ + -lNGObjWeb -lNGScripting \ -lNGMime -lNGStreams -lNGExtensions -lEOControl \ - -lDOM -lSaxObjC + -lXmlRpc -lDOM -lSaxObjC xmlrpc_call_LIB_DIRS += $(libNGObjWeb_LIB_DIRS) sope_LIB_DIRS += $(libNGObjWeb_LIB_DIRS) xmlrpc_call_TOOL_LIBS += \ - -lNGObjWeb -lNGJavaScript -lNGScripting \ + -lNGObjWeb -lNGScripting \ -lNGMime -lNGStreams -lNGExtensions -lEOControl \ -lXmlRpc -lDOM -lSaxObjC sope_TOOL_LIBS += \ - -lNGObjWeb -lNGJavaScript -lNGScripting \ + -lNGObjWeb -lNGScripting \ -lNGMime -lNGStreams -lNGExtensions -lEOControl \ -lXmlRpc -lDOM -lSaxObjC diff --git a/sope-appserver/NGObjWeb/NGHttp+WO.m b/sope-appserver/NGObjWeb/NGHttp+WO.m index c6431540..7eef5945 100644 --- a/sope-appserver/NGObjWeb/NGHttp+WO.m +++ b/sope-appserver/NGObjWeb/NGHttp+WO.m @@ -24,6 +24,7 @@ #include #include #include +#include #include "common.h" @interface WORequest(NGSupport) diff --git a/sope-appserver/NGObjWeb/NGHttp/GNUmakefile.preamble b/sope-appserver/NGObjWeb/NGHttp/GNUmakefile.preamble index 04fc04d8..557c9a4a 100644 --- a/sope-appserver/NGObjWeb/NGHttp/GNUmakefile.preamble +++ b/sope-appserver/NGObjWeb/NGHttp/GNUmakefile.preamble @@ -2,8 +2,9 @@ NGHttp_INCLUDE_DIRS += \ -I.. -I../.. \ - -I../../../skyrix-core \ - -I../../../skyrix-core/NGStreams \ - -I../../../skyrix-core/NGExtensions \ + -I../../../sope-core \ + -I../../../sope-core/NGStreams \ + -I../../../sope-core/NGExtensions \ + -I../../../sope-mime \ ADDITIONAL_CPPFLAGS += -Wall -pipe diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/GNUmakefile.preamble b/sope-appserver/NGObjWeb/NGXmlRpc/GNUmakefile.preamble index 367108bf..fff5d556 100644 --- a/sope-appserver/NGObjWeb/NGXmlRpc/GNUmakefile.preamble +++ b/sope-appserver/NGObjWeb/NGXmlRpc/GNUmakefile.preamble @@ -7,7 +7,7 @@ ADDITIONAL_CPPFLAGS += -DCOMPILING_NGOBJWEB=1 NGXmlRpc_INCLUDE_DIRS += \ -I.. -I. -I../.. \ - -I../../../skyrix-core \ - -I../../../skyrix-core/NGStreams \ - -I../../../skyrix-core/NGExtensions \ - -I../../../skyrix-xml + -I../../../sope-core \ + -I../../../sope-core/NGStreams \ + -I../../../sope-core/NGExtensions \ + -I../../../sope-xml diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcClient.m b/sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcClient.m index a0ea10bf..cade9f3f 100644 --- a/sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcClient.m +++ b/sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcClient.m @@ -28,6 +28,8 @@ #include #include #include +#include +#include @interface NSString(DigestInfo) - (NSDictionary *)parseHTTPDigestInfo; diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/common.h b/sope-appserver/NGObjWeb/NGXmlRpc/common.h new file mode 100644 index 00000000..2f0d31a2 --- /dev/null +++ b/sope-appserver/NGObjWeb/NGXmlRpc/common.h @@ -0,0 +1,23 @@ +/* + Copyright (C) 2000-2004 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + 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. +*/ + +#import +#include diff --git a/sope-appserver/NGObjWeb/SNSConnection.m b/sope-appserver/NGObjWeb/SNSConnection.m index 99616f7d..43276da1 100644 --- a/sope-appserver/NGObjWeb/SNSConnection.m +++ b/sope-appserver/NGObjWeb/SNSConnection.m @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include "common.h" #if !LIB_FOUNDATION_LIBRARY diff --git a/sope-appserver/NGObjWeb/SoOFS/GNUmakefile.preamble b/sope-appserver/NGObjWeb/SoOFS/GNUmakefile.preamble index 9289f995..4c7a45ca 100644 --- a/sope-appserver/NGObjWeb/SoOFS/GNUmakefile.preamble +++ b/sope-appserver/NGObjWeb/SoOFS/GNUmakefile.preamble @@ -5,8 +5,8 @@ ADDITIONAL_INCLUDE_DIRS += \ -I../SoObjects \ -I../WebDAV \ -I.. \ - -I../../../skyrix-core \ - -I../../../skyrix-core/NGStreams \ - -I../../../skyrix-core/NGExtensions \ - -I../../../skyrix-xml + -I../../../sope-core \ + -I../../../sope-core/NGStreams \ + -I../../../sope-core/NGExtensions \ + -I../../../sope-xml diff --git a/sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble b/sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble index ddd1b695..9be6f9fb 100644 --- a/sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble +++ b/sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble @@ -5,7 +5,7 @@ ADDITIONAL_INCLUDE_DIRS += \ -I../DynamicElements/ \ -I../WebDAV/ \ -I../.. \ - -I../../../skyrix-core \ - -I../../../skyrix-core/NGStreams \ - -I../../../skyrix-core/NGExtensions \ - -I../../../skyrix-xml + -I../../../sope-core \ + -I../../../sope-core/NGStreams \ + -I../../../sope-core/NGExtensions \ + -I../../../sope-xml diff --git a/sope-appserver/NGObjWeb/SoObjects/common.h b/sope-appserver/NGObjWeb/SoObjects/common.h new file mode 100644 index 00000000..82d4e34b --- /dev/null +++ b/sope-appserver/NGObjWeb/SoObjects/common.h @@ -0,0 +1,24 @@ +/* + Copyright (C) 2000-2004 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + 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. +*/ + +#import + +#include diff --git a/sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble b/sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble index 8dac9228..e72c2678 100644 --- a/sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble +++ b/sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble @@ -4,7 +4,7 @@ ADDITIONAL_INCLUDE_DIRS += \ -I.. \ -I../DynamicElements/ \ -I../.. \ - -I../../../skyrix-core \ - -I../../../skyrix-core/NGStreams \ - -I../../../skyrix-core/NGExtensions \ - -I../../../skyrix-xml + -I../../../sope-core \ + -I../../../sope-core/NGStreams \ + -I../../../sope-core/NGExtensions \ + -I../../../sope-xml diff --git a/sope-appserver/NGObjWeb/Templates/common.h b/sope-appserver/NGObjWeb/Templates/common.h new file mode 100644 index 00000000..ad39a0cc --- /dev/null +++ b/sope-appserver/NGObjWeb/Templates/common.h @@ -0,0 +1,33 @@ +/* + Copyright (C) 2000-2004 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + 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. +*/ + +#import + +#if !LIB_FOUNDATION_LIBRARY +# include +# include +#endif + +# include + +#define IS_DEPRECATED \ + NSLog(@"WARNING: used deprecated method: %s:%i.", \ + __PRETTY_FUNCTION__, __LINE__); diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index 08f032f4..b4b1a465 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # $Id$ -SUBMINOR_VERSION:=1 +SUBMINOR_VERSION:=2 # v4.2.413 requires libSaxObjC v4.2.33 # v4.2.341 requires libNGExtensions v4.2.77 diff --git a/sope-appserver/NGObjWeb/WOCoreApplication.m b/sope-appserver/NGObjWeb/WOCoreApplication.m index 4f2f9a17..49070208 100644 --- a/sope-appserver/NGObjWeb/WOCoreApplication.m +++ b/sope-appserver/NGObjWeb/WOCoreApplication.m @@ -27,6 +27,8 @@ #include #include #include +#include +#include #include "WORunLoop.h" #include "common.h" diff --git a/sope-appserver/NGObjWeb/WOHttpAdaptor/GNUmakefile.preamble b/sope-appserver/NGObjWeb/WOHttpAdaptor/GNUmakefile.preamble index 6f95f198..0e2a9a18 100644 --- a/sope-appserver/NGObjWeb/WOHttpAdaptor/GNUmakefile.preamble +++ b/sope-appserver/NGObjWeb/WOHttpAdaptor/GNUmakefile.preamble @@ -1,10 +1,11 @@ -# $Id$ +# compiler flags ADDITIONAL_CPPFLAGS += -pipe -Wall ADDITIONAL_CPPFLAGS += -DCOMPILING_NGOBJWEB=1 WOHttpAdaptor_INCLUDE_DIRS += \ -I.. -I. -I../.. \ - -I../../../skyrix-core \ - -I../../../skyrix-core/NGStreams \ - -I../../../skyrix-core/NGExtensions \ + -I../../../sope-core \ + -I../../../sope-core/NGStreams \ + -I../../../sope-core/NGExtensions \ + -I../../../sope-mime diff --git a/sope-appserver/NGObjWeb/WOHttpAdaptor/common.h b/sope-appserver/NGObjWeb/WOHttpAdaptor/common.h new file mode 100644 index 00000000..ddc6693c --- /dev/null +++ b/sope-appserver/NGObjWeb/WOHttpAdaptor/common.h @@ -0,0 +1,26 @@ +/* + Copyright (C) 2000-2004 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + 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. +*/ + +#import + +#include +#include +#include diff --git a/sope-appserver/NGObjWeb/WebDAV/GNUmakefile.preamble b/sope-appserver/NGObjWeb/WebDAV/GNUmakefile.preamble index 87fc44a2..4af3dc4e 100644 --- a/sope-appserver/NGObjWeb/WebDAV/GNUmakefile.preamble +++ b/sope-appserver/NGObjWeb/WebDAV/GNUmakefile.preamble @@ -1,11 +1,11 @@ -# $Id$ +# compiler flags ADDITIONAL_INCLUDE_DIRS += \ -I.. \ -I../SoObjects/ \ -I../DynamicElements/ \ -I../.. \ - -I../../../skyrix-core \ - -I../../../skyrix-core/NGStreams \ - -I../../../skyrix-core/NGExtensions \ - -I../../../skyrix-xml + -I../../../sope-core \ + -I../../../sope-core/NGStreams \ + -I../../../sope-core/NGExtensions \ + -I../../../sope-xml diff --git a/sope-appserver/NGObjWeb/WebDAV/SoSubscription.m b/sope-appserver/NGObjWeb/WebDAV/SoSubscription.m index f27ae11f..5d447a1e 100644 --- a/sope-appserver/NGObjWeb/WebDAV/SoSubscription.m +++ b/sope-appserver/NGObjWeb/WebDAV/SoSubscription.m @@ -1,7 +1,7 @@ /* - Copyright (C) 2000-2003 SKYRIX Software AG + Copyright (C) 2002-2004 SKYRIX Software AG - This file is part of OGo + This file is part of OpenGroupware.org. 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 @@ -23,6 +23,8 @@ #include "SoSubscription.h" #include #include +#include +#include #include "common.h" @implementation SoSubscription diff --git a/sope-appserver/NGObjWeb/WebDAV/common.h b/sope-appserver/NGObjWeb/WebDAV/common.h new file mode 100644 index 00000000..2f0d31a2 --- /dev/null +++ b/sope-appserver/NGObjWeb/WebDAV/common.h @@ -0,0 +1,23 @@ +/* + Copyright (C) 2000-2004 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + 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. +*/ + +#import +#include diff --git a/sope-appserver/NGObjWeb/common.h b/sope-appserver/NGObjWeb/common.h index 8de16c91..d414186f 100644 --- a/sope-appserver/NGObjWeb/common.h +++ b/sope-appserver/NGObjWeb/common.h @@ -1,7 +1,7 @@ /* - Copyright (C) 2000-2003 SKYRIX Software AG + Copyright (C) 2000-2004 SKYRIX Software AG - This file is part of OGo + This file is part of OpenGroupware.org. 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 @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #ifndef __NGObjWeb_common_H__ #define __NGObjWeb_common_H__ @@ -55,9 +54,6 @@ #include #include -#include - -#include #if NeXT_RUNTIME || APPLE_RUNTIME # ifndef sel_get_name diff --git a/sope-appserver/NGObjWeb/ngobjweb.make b/sope-appserver/NGObjWeb/ngobjweb.make index 77781f72..d8720c03 100644 --- a/sope-appserver/NGObjWeb/ngobjweb.make +++ b/sope-appserver/NGObjWeb/ngobjweb.make @@ -4,14 +4,9 @@ WO_LDFLAGS = WO_LIBS = -lNGObjWeb -lNGMime -lNGStreams -lNGExtensions WO_DEFINE = -DNGObjWeb_LIBRARY=1 -ifeq ($(FOUNDATION_LIB),nx) -WO_LIBS += -lFoundationExt -endif - ifeq ($(FOUNDATION_LIB),apple) WO_LIBS += \ - -lNGJavaScript -lNGScripting \ + -lNGScripting \ -lNGMime -lNGStreams -lNGExtensions -lEOControl \ - -lXmlRpc -lDOM -lSaxObjC \ - -ljs + -lXmlRpc -lDOM -lSaxObjC endif diff --git a/sope-appserver/NGObjWeb/xmlrpc_call.m b/sope-appserver/NGObjWeb/xmlrpc_call.m index 2adc614c..8c283a51 100644 --- a/sope-appserver/NGObjWeb/xmlrpc_call.m +++ b/sope-appserver/NGObjWeb/xmlrpc_call.m @@ -35,6 +35,8 @@ #include "common.h" #include +#include +#include #if !LIB_FOUNDATION_LIBRARY # include "UnixSignalHandler.h" @@ -259,15 +261,6 @@ return self; } -- (void)dealloc { - [self->client release]; - [self->methodName release]; - [self->parameters release]; - [super dealloc]; -} - -// - - (BOOL)initXmlRpcClientWithStringURL:(NSString *)_url { NSURL *url = nil; @@ -305,6 +298,15 @@ } } +- (void)dealloc { + [self->client release]; + [self->methodName release]; + [self->parameters release]; + [super dealloc]; +} + +/* printing */ + - (void)printElement:(id)element { [element printWithTool:self]; } diff --git a/sope-appserver/common.make b/sope-appserver/common.make index 4310c677..45fb8952 100644 --- a/sope-appserver/common.make +++ b/sope-appserver/common.make @@ -9,11 +9,19 @@ GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT) ADDITIONAL_CPPFLAGS += -pipe -Wall -Wno-protocol ADDITIONAL_INCLUDE_DIRS += \ - -I.. \ - -I../../skyrix-core/ \ - -I../../skyrix-core/NGExtensions + -I.. \ + -I../../sope-core/ \ + -I../../sope-core/NGExtensions \ + -I../../sope-core/NGStreams \ + -I../../sope-xml -ADDITIONAL_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR) +ADDITIONAL_LIB_DIRS += \ + -L./$(GNUSTEP_OBJ_DIR) \ + -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR) \ ifeq ($(FOUNDATION_LIB),nx) ADDITIONAL_LDFLAGS += -framework Foundation diff --git a/sope-core/samples/common.h b/sope-core/samples/common.h index 408caa9c..662c92cc 100644 --- a/sope-core/samples/common.h +++ b/sope-core/samples/common.h @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #import diff --git a/sope-ldap/GNUmakefile b/sope-ldap/GNUmakefile index fe9775fc..041b0ca1 100644 --- a/sope-ldap/GNUmakefile +++ b/sope-ldap/GNUmakefile @@ -4,7 +4,7 @@ PACKAGE_NAME=sope-ldap VERSION=4.3.0 SUBPROJECTS = \ - NGLdap \ + NGLdap \ samples include $(GNUSTEP_MAKEFILES)/aggregate.make -- 2.39.5