]> err.no Git - sope/commitdiff
fixed NGObjWeb for SOPE 3.3
authorhelge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Fri, 20 Aug 2004 21:07:18 +0000 (21:07 +0000)
committerhelge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Fri, 20 Aug 2004 21:07:18 +0000 (21:07 +0000)
git-svn-id: http://svn.opengroupware.org/SOPE/trunk@14 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

32 files changed:
README
sope-appserver/NGObjWeb/Associations/GNUmakefile.preamble
sope-appserver/NGObjWeb/Associations/common.h [new file with mode: 0644]
sope-appserver/NGObjWeb/ChangeLog
sope-appserver/NGObjWeb/DynamicElements/GNUmakefile.preamble
sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m
sope-appserver/NGObjWeb/DynamicElements/common.h
sope-appserver/NGObjWeb/GNUmakefile.preamble
sope-appserver/NGObjWeb/NGHttp+WO.m
sope-appserver/NGObjWeb/NGHttp/GNUmakefile.preamble
sope-appserver/NGObjWeb/NGXmlRpc/GNUmakefile.preamble
sope-appserver/NGObjWeb/NGXmlRpc/NGXmlRpcClient.m
sope-appserver/NGObjWeb/NGXmlRpc/common.h [new file with mode: 0644]
sope-appserver/NGObjWeb/SNSConnection.m
sope-appserver/NGObjWeb/SoOFS/GNUmakefile.preamble
sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble
sope-appserver/NGObjWeb/SoObjects/common.h [new file with mode: 0644]
sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble
sope-appserver/NGObjWeb/Templates/common.h [new file with mode: 0644]
sope-appserver/NGObjWeb/Version
sope-appserver/NGObjWeb/WOCoreApplication.m
sope-appserver/NGObjWeb/WOHttpAdaptor/GNUmakefile.preamble
sope-appserver/NGObjWeb/WOHttpAdaptor/common.h [new file with mode: 0644]
sope-appserver/NGObjWeb/WebDAV/GNUmakefile.preamble
sope-appserver/NGObjWeb/WebDAV/SoSubscription.m
sope-appserver/NGObjWeb/WebDAV/common.h [new file with mode: 0644]
sope-appserver/NGObjWeb/common.h
sope-appserver/NGObjWeb/ngobjweb.make
sope-appserver/NGObjWeb/xmlrpc_call.m
sope-appserver/common.make
sope-core/samples/common.h
sope-ldap/GNUmakefile

diff --git a/README b/README
index 1fa35788eb6672db929cf86d1d85e971402d4aac..ec5c18f24bc0a966a9986054ebc4084548dc1e97 100644 (file)
--- 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)
index 0f9aea933fd8a7915020b27f8fa94e952c9ac65b..6c40b404449262f14659e353c285716c46d6ae11 100644 (file)
@@ -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 (file)
index 0000000..0ebf13f
--- /dev/null
@@ -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 <Foundation/Foundation.h>
+
+#if !LIB_FOUNDATION_LIBRARY
+#  include <NGExtensions/NGObjectMacros.h>
+#  include <NGExtensions/NSString+Ext.h>
+#endif
+
+#include <NGExtensions/NGExtensions.h>
+
+#define IS_DEPRECATED \
+  NSLog(@"WARNING: used deprecated method: %s:%i.", \
+        __PRETTY_FUNCTION__, __LINE__);
index 191f641f2c64aab816eafa18d520e413419887c9..770c449c5c905c8cde4c3467bd3ba002eb3302b3 100644 (file)
@@ -1,5 +1,13 @@
 2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
 
+       * 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)
 
index ff6a033f21b2b10894e41545eb1b2729ca6db4da..b540adce8888ba0c35704e58599b0ba0c7735242 100644 (file)
@@ -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
index d52f5cd05067696c6cc42e67d9f8233dab34718d..cbf8af6dc476ce382e64ea3be280fd3ef387c0d8 100644 (file)
@@ -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
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "WOInput.h"
-#include "common.h"
-#import <NGMime/NGMime.h>
-#import <NGHttp/NGHttp.h>
 
 @interface WOFileUpload : WOInput
 {
 
 @end /* WOFileUpload */
 
+#include "common.h"
+#include <NGMime/NGMime.h>
+#include <NGHttp/NGHttp.h>
+
 @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<NGMimePart> 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<NGMimePart> 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, "<input type=\"file\" name=\"");
-    [_response appendContentHTMLAttributeValue:OWFormElementName(self, _ctx)];
+  WOResponse_AddCString(_response, "<input type=\"file\" name=\"");
+  [_response appendContentHTMLAttributeValue:OWFormElementName(self, _ctx)];
+  WOResponse_AddChar(_response, '"');
+  if (v != nil) {
+    WOResponse_AddCString(_response, " value=\"");
+    [_response appendContentHTMLAttributeValue:v];
     WOResponse_AddChar(_response, '"');
-    if (v) {
-      WOResponse_AddCString(_response, " value=\"");
-      [_response appendContentHTMLAttributeValue:v];
-      WOResponse_AddChar(_response, '"');
-    }
-    [self appendExtraAttributesToResponse:_response inContext:_ctx];
+  }
+  [self appendExtraAttributesToResponse:_response inContext:_ctx];
   
-    if (self->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 */
index 4d60bf7ba07909db66b3898b9c7b189055854415..1b73c1b34e8ad754ef3e8af95f6d20c1fddd7f65 100644 (file)
@@ -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__
index 3c1576a30289033c2453834c23f633567a21ec29..1df229c4e0c8584fda8727ca862a4d9676ebfb33 100644 (file)
@@ -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
 
index c643154024a9af9f777ca8918d5fc487bcefffc6..7eef5945304084440877ad8d65774a2ed1e9dd1d 100644 (file)
@@ -24,6 +24,7 @@
 #include <NGHttp/NGHttp.h>
 #include <NGObjWeb/WOCookie.h>
 #include <NGObjWeb/WORequest.h>
+#include <NGMime/NGMime.h>
 #include "common.h"
 
 @interface WORequest(NGSupport)
index 04fc04d87d39ea0d34f6c0bbf874109779fcfd1e..557c9a4a489be04b1d0cf7bc4b4e5e019860ff95 100644 (file)
@@ -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
index 367108bfd1057b9e8193c36d86bdc51ed601e471..fff5d55698d877933f9eece623bee8180e05f27f 100644 (file)
@@ -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
index a0ea10bff427a19f247940f513d9f8262942ae53..cade9f3f820a2fb6ecb4a855a650a2464ebad2e7 100644 (file)
@@ -28,6 +28,8 @@
 #include <NGObjWeb/WOResponse.h>
 #include <NGObjWeb/WORequest.h>
 #include <NGStreams/NGBufferedStream.h>
+#include <NGStreams/NGActiveSocket.h>
+#include <NGStreams/NGStreamExceptions.h>
 
 @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 (file)
index 0000000..2f0d31a
--- /dev/null
@@ -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 <Foundation/Foundation.h>
+#include <NGExtensions/NGExtensions.h>
index 99616f7ddef854519f83e1860dedf38c95a656b8..43276da16d89d3cb1670a738cb47e3f99e13dce9 100644 (file)
@@ -24,6 +24,8 @@
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOAdaptor.h>
 #include <NGObjWeb/WOSession.h>
+#include <NGStreams/NGStreams.h>
+#include <NGStreams/NGNet.h>
 #include "common.h"
 
 #if !LIB_FOUNDATION_LIBRARY
index 9289f9959b3692f5d5c343a74f4f9e552758db91..4c7a45caf5797aeba09bc650096cf4ed4fecd30e 100644 (file)
@@ -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
 
index ddd1b695e53bc6ab039a77a6f02836ad0e1433b7..9be6f9fbaf0358615dec70dc1dd2b3115ef7379c 100644 (file)
@@ -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 (file)
index 0000000..82d4e34
--- /dev/null
@@ -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 <Foundation/Foundation.h>
+
+#include <NGExtensions/NGExtensions.h>
index 8dac9228086ad970c7d581ccaae20733ab82971b..e72c26781c22b2af69d7cd5094df42caffaada4b 100644 (file)
@@ -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 (file)
index 0000000..ad39a0c
--- /dev/null
@@ -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 <Foundation/Foundation.h>
+
+#if !LIB_FOUNDATION_LIBRARY
+#  include <NGExtensions/NGObjectMacros.h>
+#  include <NGExtensions/NSString+Ext.h>
+#endif
+
+#  include <NGExtensions/NGExtensions.h>
+
+#define IS_DEPRECATED \
+  NSLog(@"WARNING: used deprecated method: %s:%i.", \
+        __PRETTY_FUNCTION__, __LINE__);
index 08f032f41eb42a673145b77291943373c9081d79..b4b1a465aeec413d00f3bf012fa3d6832b7c154b 100644 (file)
@@ -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
index 4f2f9a1759712e45c3ce9bda5ad5125d476b8d28..490702087413c28aeebeb204849236d3358f2965 100644 (file)
@@ -27,6 +27,8 @@
 #include <NGObjWeb/WOResponse.h>
 #include <NGObjWeb/WOContext.h>
 #include <EOControl/EOControl.h>
+#include <NGStreams/NGStreams.h>
+#include <NGStreams/NGNet.h>
 #include "WORunLoop.h"
 #include "common.h"
 
index 6f95f1986ac535b41c10ec4975f736704c342768..0e2a9a1815b7201c7f9f16e30ea80523b38bb72c 100644 (file)
@@ -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 (file)
index 0000000..ddc6693
--- /dev/null
@@ -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 <Foundation/Foundation.h>
+
+#include <NGExtensions/NGExtensions.h>
+#include <NGStreams/NGStreams.h>
+#include <NGStreams/NGNet.h>
index 87fc44a2d5100387edb0455f9dd9f9f7707c3cf2..4af3dc4ecc73fe64b140be03d0129d5ebb7696a1 100644 (file)
@@ -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
index f27ae11fa6a2c9e2c5276484f3ca821f38709704..5d447a1e9ee8daf87ecfc912492f1cc2b18db03d 100644 (file)
@@ -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 <NGStreams/NGDatagramPacket.h>
 #include <NGStreams/NGDatagramSocket.h>
+#include <NGStreams/NGInternetSocketAddress.h>
+#include <NGStreams/NGInternetSocketDomain.h>
 #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 (file)
index 0000000..2f0d31a
--- /dev/null
@@ -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 <Foundation/Foundation.h>
+#include <NGExtensions/NGExtensions.h>
index 8de16c910d46ec54cbe9f1e7d4db956e460fb84b..d414186fda0ecf4c5135e3e75181d098a3a6ceda 100644 (file)
@@ -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 <NGExtensions/NGExtensions.h>
 #include <NGStreams/NGStreams.h>
-#include <NGStreams/NGNet.h>
-
-#include <NGMime/NGMime.h>
 
 #if NeXT_RUNTIME || APPLE_RUNTIME
 #  ifndef sel_get_name
index 77781f72cf1fa15bdfa95bef0aa67a15763092ff..d8720c035a9622edfec774d5fa14129e354e9607 100644 (file)
@@ -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
index 2adc614c7e250a1775f97a1e0f6dfd964ff9e16f..8c283a5178545cddf6ea3add8d2b89368fc396c2 100644 (file)
@@ -35,6 +35,8 @@
 #include "common.h"
 
 #include <NGExtensions/NSString+Ext.h>
+#include <NGStreams/NGStreams.h>
+#include <NGStreams/NGNet.h>
 
 #if !LIB_FOUNDATION_LIBRARY
 #  include "UnixSignalHandler.h"
   return self;
 }
 
-- (void)dealloc {
-  [self->client      release];
-  [self->methodName  release];
-  [self->parameters  release];
-  [super dealloc];
-}
-
-//
-
 - (BOOL)initXmlRpcClientWithStringURL:(NSString *)_url {
   NSURL *url = nil;
   
   }
 }
 
+- (void)dealloc {
+  [self->client      release];
+  [self->methodName  release];
+  [self->parameters  release];
+  [super dealloc];
+}
+
+/* printing */
+
 - (void)printElement:(id)element {
   [element printWithTool:self];
 }
index 4310c67777fd5e9d140876e708af95c698bc3c16..45fb8952392e6eaba35807cb28cc97067dbc7617 100644 (file)
@@ -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
index 408caa9c9679c76b03ea222822f07794005daa56..662c92ccdb8bfdc71db944bc4c9d95d67c1afd1d 100644 (file)
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #import <Foundation/Foundation.h>
 
index fe9775fca6f145e659535a7df3365aa37e6a80f1..041b0ca199d540184839b1afd568e2a676f55e0e 100644 (file)
@@ -4,7 +4,7 @@ PACKAGE_NAME=sope-ldap
 VERSION=4.3.0
 
 SUBPROJECTS = \
-       NGLdap          \
+       NGLdap  \
        samples
 
 include $(GNUSTEP_MAKEFILES)/aggregate.make