From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Sun, 22 Aug 2004 16:05:00 +0000 (+0000)
Subject: ivar extensions to NGObjWeb core classes, moved SoOFS to separate project
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7a6a6641f3f6b5815178c4fe3df82ccfd742287;p=sope

ivar extensions to NGObjWeb core classes, moved SoOFS to separate project


git-svn-id: http://svn.opengroupware.org/SOPE/trunk@35 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/sope-appserver/ChangeLog b/sope-appserver/ChangeLog
index b84ecee0..0686703f 100644
--- a/sope-appserver/ChangeLog
+++ b/sope-appserver/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-22  Helge Hess  <helge.hess@opengroupware.org>
+
+	* added SoOFS as a separate project
+
 2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
 
 	* moved SxComponents to Recycler
diff --git a/sope-appserver/GNUmakefile b/sope-appserver/GNUmakefile
index 1a09a823..376c7830 100644
--- a/sope-appserver/GNUmakefile
+++ b/sope-appserver/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: GNUmakefile 6 2004-08-20 17:57:50Z helge $
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
@@ -11,6 +11,7 @@ SUBPROJECTS += \
 	WEExtensions	\
 	WOExtensions	\
 	WOXML		\
+	SoOFS		\
 
 -include $(GNUSTEP_MAKEFILES)/GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/aggregate.make
diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 770c449c..8c09dd3c 100644
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,12 @@
+2004-08-22  Helge Hess  <helge.hess@opengroupware.org>
+
+	* v4.3.3
+	
+	* moved the SoOFS library/sope tool to a separate project
+
+	* WORequest, WOMessage, WOContext: added new ivars to avoid user-info
+	  dictionary
+
 2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
 
 	* v4.3.2
diff --git a/sope-appserver/NGObjWeb/GNUmakefile b/sope-appserver/NGObjWeb/GNUmakefile
index e4d177d2..f0b048ac 100644
--- a/sope-appserver/NGObjWeb/GNUmakefile
+++ b/sope-appserver/NGObjWeb/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $
 
 include ../common.make
 include ./Version
@@ -20,7 +20,6 @@ libNGObjWeb_SUBPROJECTS = \
 	WOHttpAdaptor	\
 	SoObjects	\
 	WebDAV		\
-	SoOFS		\
 	NGXmlRpc	\
 
 libNGObjWeb_HEADER_FILES_DIR         = NGObjWeb
@@ -129,7 +128,7 @@ libNGObjWeb_OBJC_FILES = \
 
 # ----- SoCore product for SOPE core registrations
 
-BUNDLE_NAME      = SoCore SoOFS
+BUNDLE_NAME      = SoCore
 BUNDLE_EXTENSION = .sxp
 BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts
 
@@ -137,13 +136,9 @@ SoCore_OBJC_FILES      = SoCoreProduct.m
 SoCore_RESOURCE_FILES  = SoObjects/product.plist Version
 SoCore_PRINCIPAL_CLASS = SoCoreProduct
 
-SoOFS_OBJC_FILES       = SoOFSProduct.m
-SoOFS_RESOURCE_FILES   = SoOFS/product.plist Version
-SoOFS_PRINCIPAL_CLASS  = SoOFSProduct
-
 # ----- NGObjWeb tools
 
-TOOL_NAME = wod xmlrpc_call sope
+TOOL_NAME = wod xmlrpc_call
 
 wod_OBJC_FILES  += wod.m $(NGObjWebCore_OBJC_FILES)
 ifeq ($(FOUNDATION_LIB),gnu)
@@ -152,13 +147,9 @@ endif
 wod_SUBPROJECTS = Templates Associations
 
 xmlrpc_call_OBJC_FILES = xmlrpc_call.m
-sope_OBJC_FILES        = sope.m
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/library.make
 include $(GNUSTEP_MAKEFILES)/bundle.make
 include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
-
-autodoc :
-	autodoc $(AUTODOC_FLAGS) -dest $(AUTODOC_DESTPATH)/NGObjWeb/ -proj .
diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble
index 15a872eb..1631d1c3 100644
--- a/sope-appserver/NGObjWeb/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble
@@ -1,16 +1,19 @@
-# $Id$
+# $Id: GNUmakefile.preamble 25 2004-08-20 23:01:07Z helge $
 
 ADDITIONAL_CPPFLAGS += -Wall -DCOMPILE_FOR_GSTEP_MAKE=1
 
+SOPE_ROOT=../..
+CORE_ROOT=$(SOPE_ROOT)/sope-core
+
 ADDITIONAL_INCLUDE_DIRS += \
 	-I.			\
 	-I./DynamicElements/	\
 	-I./Templates/		\
 	-I..			\
-	-I../../sope-core		\
-	-I../../sope-core/NGStreams/	\
-	-I../../sope-core/NGExtensions	\
-	-I../../sope-mime
+	-I$(CORE_ROOT)		\
+	-I$(CORE_ROOT)/NGStreams/	\
+	-I$(CORE_ROOT)/NGExtensions	\
+	-I$(SOPE_ROOT)/sope-mime
 
 libNGObjWeb_OBJCFLAGS += -Wall -Wno-import -Wno-protocol
 
@@ -36,13 +39,13 @@ else
 libNGObjWeb_LIB_DIRS += \
 	-L./$(GNUSTEP_OBJ_DIR)			\
 	-L../NGScripting/$(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)
+	-L$(SOPE_ROOT)/sope-mime/$(GNUSTEP_OBJ_DIR)		\
+	-L$(CORE_ROOT)/NGStreams/$(GNUSTEP_OBJ_DIR)		\
+	-L$(CORE_ROOT)/NGExtensions/$(GNUSTEP_OBJ_DIR)		\
+	-L$(CORE_ROOT)/EOControl/$(GNUSTEP_OBJ_DIR)		\
+	-L$(SOPE_ROOT)/sope-xml/XmlRpc/$(GNUSTEP_OBJ_DIR)	\
+	-L$(SOPE_ROOT)/sope-xml/DOM/$(GNUSTEP_OBJ_DIR)		\
+	-L$(SOPE_ROOT)/sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
 endif
 
 libNGObjWeb_LIBRARIES_DEPEND_UPON += \
@@ -57,18 +60,12 @@ wod_TOOL_LIBS += \
 	-lXmlRpc -lDOM -lSaxObjC
 
 xmlrpc_call_LIB_DIRS += $(libNGObjWeb_LIB_DIRS)
-sope_LIB_DIRS        += $(libNGObjWeb_LIB_DIRS)
 
 xmlrpc_call_TOOL_LIBS += \
 	-lNGObjWeb -lNGScripting	\
 	-lNGMime -lNGStreams -lNGExtensions -lEOControl \
 	-lXmlRpc -lDOM -lSaxObjC
 
-sope_TOOL_LIBS += \
-	-lNGObjWeb -lNGScripting	\
-	-lNGMime -lNGStreams -lNGExtensions -lEOControl \
-	-lXmlRpc -lDOM -lSaxObjC
-
 # platform specific settings
 
 ifneq ($(findstring openbsd3, $(GNUSTEP_TARGET_OS)), openbsd3)
@@ -76,7 +73,6 @@ ifneq ($(findstring openbsd3, $(GNUSTEP_TARGET_OS)), openbsd3)
 ifneq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin)
 # and neither does MacOSX? ...
 libNGObjWeb_LIBRARIES_DEPEND_UPON += -lcrypt
-sope_TOOL_LIBS += -lcrypt
 endif
 endif
 
diff --git a/sope-appserver/NGObjWeb/NGObjWeb/WOContext.h b/sope-appserver/NGObjWeb/NGObjWeb/WOContext.h
index 25ee5378..c51b05ae 100644
--- a/sope-appserver/NGObjWeb/NGObjWeb/WOContext.h
+++ b/sope-appserver/NGObjWeb/NGObjWeb/WOContext.h
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #ifndef __NGObjWeb_WOContext_H__
 #define __NGObjWeb_WOContext_H__
@@ -83,6 +82,9 @@
   NSString       *soRequestType; // WebDAV, XML-RPC, METHOD
   id             objectDispatcher;
   NSString       *pathInfo;
+  id             rootURL;
+  id             objectPermissionCache;
+  id             activeUser;
   
 #if WITH_DEALLOC_OBSERVERS
 @private
diff --git a/sope-appserver/NGObjWeb/NGObjWeb/WOMessage.h b/sope-appserver/NGObjWeb/NGObjWeb/WOMessage.h
index 785f5a01..2cbd5390 100644
--- a/sope-appserver/NGObjWeb/NGObjWeb/WOMessage.h
+++ b/sope-appserver/NGObjWeb/NGObjWeb/WOMessage.h
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #ifndef __NGObjWeb_WOMessage_H__
 #define __NGObjWeb_WOMessage_H__
@@ -47,6 +46,7 @@
   NSMutableArray   *cookies;
   NSStringEncoding contentEncoding;
   id<NGStream>     contentStream;
+  id               domCache;
   
   struct {
     BOOL didStartWriting:1; // afterwards no headers may be changed
diff --git a/sope-appserver/NGObjWeb/NGObjWeb/WORequest.h b/sope-appserver/NGObjWeb/NGObjWeb/WORequest.h
index a8089da9..e9aa3120 100644
--- a/sope-appserver/NGObjWeb/NGObjWeb/WORequest.h
+++ b/sope-appserver/NGObjWeb/NGObjWeb/WORequest.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: WORequest.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __NGObjWeb_WORequest_H__
 #define __NGObjWeb_WORequest_H__
@@ -27,7 +27,7 @@
 #include <NGObjWeb/WOMessage.h>
 #include <NGObjWeb/NGObjWebDecls.h>
 
-@class NSString, NSArray, NSData, NSDictionary;
+@class NSString, NSArray, NSData, NSDictionary, NSCalendarDate;
 @class NGHashMap;
 @class NGHttpRequest;
 
@@ -54,6 +54,10 @@ NGObjWeb_EXPORT NSString *WONoSelectionString;
   NSString     *appName;
   NSString     *requestHandlerKey;
   NSString     *requestHandlerPath;
+
+@protected
+  NSCalendarDate *startDate;
+  id             startStatistics;
 }
 
 - (id)initWithMethod:(NSString *)_method
diff --git a/sope-appserver/NGObjWeb/NGXmlRpc/EOKeyGlobalID+XmlRpcCoding.m b/sope-appserver/NGObjWeb/NGXmlRpc/EOKeyGlobalID+XmlRpcCoding.m
index b0b04d8d..c3cd5113 100644
--- a/sope-appserver/NGObjWeb/NGXmlRpc/EOKeyGlobalID+XmlRpcCoding.m
+++ b/sope-appserver/NGObjWeb/NGXmlRpc/EOKeyGlobalID+XmlRpcCoding.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,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include <EOControl/EOKeyGlobalID.h>
 #include "common.h"
@@ -49,7 +48,7 @@
 
   free(vals); vals = NULL;
   
-  RELEASE(self);
+  [self release];
   return [globalID retain];
 }
 
diff --git a/sope-appserver/NGObjWeb/SoOFS/GNUmakefile.preamble b/sope-appserver/NGObjWeb/SoOFS/GNUmakefile.preamble
deleted file mode 100644
index 4c7a45ca..00000000
--- a/sope-appserver/NGObjWeb/SoOFS/GNUmakefile.preamble
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Id$
-
-ADDITIONAL_INCLUDE_DIRS += \
-	-I.		\
-	-I../SoObjects	\
-	-I../WebDAV	\
-	-I..		\
-	-I../../../sope-core			\
-	-I../../../sope-core/NGStreams		\
-	-I../../../sope-core/NGExtensions	\
-	-I../../../sope-xml
-
diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObject.m b/sope-appserver/NGObjWeb/SoObjects/SoObject.m
index 337ae90c..b3d81996 100644
--- a/sope-appserver/NGObjWeb/SoObjects/SoObject.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoObject.m
@@ -18,14 +18,13 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "SoObject.h"
 #include "SoClassRegistry.h"
 #include "SoClass.h"
 #include "SoSecurityManager.h"
+#include "WOContext+SoObjects.h"
 #include <EOControl/EOClassDescription.h>
-#include <NGObjWeb/WOContext.h>
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WORequest.h>
 #include "common.h"
@@ -34,8 +33,6 @@
 - (BOOL)isFolderish;
 @end
 
-static NSString *SoRootURLVarKey = @"SoRootURL";
-
 @implementation NSObject(SoObject)
 
 static int debugLookup  = -1;
@@ -292,9 +289,9 @@ static void _initialize(void) {
   int       port;
   _initialize();
   
-  if ((rootURL = [(WOContext *)_ctx objectForKey:SoRootURLVarKey]) != nil) {
+  if ((rootURL = [_ctx rootURL]) != nil) {
     if (debugBaseURL) {
-      [self logWithFormat:@"  using root-url from context (SoRootURL): %@",
+      [self logWithFormat:@"  using root-url from context: %@",
               rootURL];
     }
     return rootURL;
@@ -365,10 +362,10 @@ static void _initialize(void) {
     rootURL = [rootURL stringByAppendingFormat:@"%@/", rh];
   
   if (debugBaseURL) {
-    [self logWithFormat:@"  setting root-url in context (SoRootURL): %@",
+    [self logWithFormat:@"  setting root-url in context: %@",
 	    rootURL];
   }
-  [(WOContext *)_ctx setObject:rootURL forKey:SoRootURLVarKey];
+  [(WOContext *)_ctx setRootURL:rootURL];
   return rootURL;
 }
 
diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjectRequestHandler.m b/sope-appserver/NGObjWeb/SoObjects/SoObjectRequestHandler.m
index 9a98dbe7..6b12551a 100644
--- a/sope-appserver/NGObjWeb/SoObjects/SoObjectRequestHandler.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoObjectRequestHandler.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: SoObjectRequestHandler.m 24 2004-08-20 22:54:26Z helge $
 
 #include "SoObjectRequestHandler.h"
 #include "SoObject.h"
@@ -33,7 +33,6 @@
 #include <NGObjWeb/WOElement.h>
 #include <NGObjWeb/WOTemplate.h>
 #include <NGObjWeb/WEClientCapabilities.h>
-#include <SoOFS/OFSBaseObject.h>
 #include <NGExtensions/NGRuleContext.h>
 #include <NGExtensions/NSString+Ext.h>
 #include "WOComponent+private.h"
@@ -45,6 +44,10 @@
 - (void)_sleepWithContext:(WOContext *)_ctx;
 @end
 
+@interface NSObject(SoOFS)
+- (NSString *)storagePath;
+@end
+
 @implementation SoObjectRequestHandler
 
 static BOOL debugOn       = NO;
@@ -606,22 +609,24 @@ static NSString *rapidTurnAroundPath = nil;
   }
 
   /* rapid turnaround */
-  if(rapidTurnAroundPath != nil) {
+  if (rapidTurnAroundPath != nil) {
     WOComponent *page;
     NSString *_path = nil;
 
-    if((page = [_ctx page])) {
+    if ((page = [_ctx page])) {
       WOElement *template;
           
       template = [page _woComponentTemplate];
-      if([template isKindOfClass:WOTemplateClass])
+      if ([template isKindOfClass:WOTemplateClass])
         _path = [[(WOTemplate *)template url] path];
     }
     else {
-      if([object isKindOfClass:[OFSBaseObject class]])
+      // TODO: ZNeK: explain!
+      //       I guess we need some generic method to retrieve a template path?
+      if ([object isKindOfClass:NSClassFromString(@"OFSBaseObject")])
         _path = [object storagePath];
     }
-    if(_path != nil)
+    if (_path != nil)
       [r setHeader:_path forKey:@"x-sope-template-path"];
   }
   
diff --git a/sope-appserver/NGObjWeb/SoObjects/SoSecurityManager.m b/sope-appserver/NGObjWeb/SoObjects/SoSecurityManager.m
index ad2de076..fb1bd254 100644
--- a/sope-appserver/NGObjWeb/SoObjects/SoSecurityManager.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoSecurityManager.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "SoSecurityManager.h"
 #include "SoObject.h"
@@ -27,7 +26,7 @@
 #include "SoPermissions.h"
 #include "SoUser.h"
 #include "SoSecurityException.h"
-#include <NGObjWeb/WOContext.h>
+#include "WOContext+SoObjects.h"
 #include <NGObjWeb/WOResponse.h>
 #include <NGObjWeb/WOApplication.h>
 #include "common.h"
@@ -45,8 +44,6 @@
 - (BOOL)isSoAnonymousUserLogin;
 @end
 
-static NSString *SoActiveUser     = @"SoActiveUser";
-static NSString *SoObjPermCache   = @"__validatedobjs";
 #if USE_PERM_CACHE
 static NSString *SoPermCache      = @"__validatedperms";
 #endif
@@ -145,13 +142,13 @@ static int debugOn = -1;
 - (id<SoUser>)userInContext:(id)_ctx object:(id)_object {
   id user, authenticator;
   
-  if ((user = [(WOContext *)_ctx objectForKey:SoActiveUser]))
+  if ((user = [(WOContext *)_ctx activeUser]) != nil)
     return [user isNotNull] ? user : nil;
   
   authenticator = [self authenticatorInContext:_ctx object:_object];
     
-  if ((user = [authenticator userInContext:_ctx]))
-    [(WOContext *)_ctx setObject:user forKey:SoActiveUser];
+  if ((user = [authenticator userInContext:_ctx]) != nil)
+    [(WOContext *)_ctx setActiveUser:user];
   
   return [user isNotNull] ? user : nil;
 }
@@ -347,14 +344,14 @@ static int debugOn = -1;
     return nil;
   
   /* check the cache */
-  if ((validatedObjects = [(WOContext *)_ctx objectForKey:SoObjPermCache])) {
+  if ((validatedObjects = [(WOContext *)_ctx objectPermissionCache])) {
     if ([validatedObjects indexOfObjectIdenticalTo:_object] != NSNotFound)
       return nil;
   }
   else {
     /* setup cache */
     validatedObjects = [[NSMutableArray alloc] init];
-    [(WOContext *)_ctx setObject:validatedObjects forKey:SoObjPermCache];
+    [(WOContext *)_ctx setObjectPermissionCache:validatedObjects];
     [validatedObjects autorelease];
   }
   
diff --git a/sope-appserver/NGObjWeb/SoObjects/WOContext+SoObjects.h b/sope-appserver/NGObjWeb/SoObjects/WOContext+SoObjects.h
index f7e3745d..9a80d699 100644
--- a/sope-appserver/NGObjWeb/SoObjects/WOContext+SoObjects.h
+++ b/sope-appserver/NGObjWeb/SoObjects/WOContext+SoObjects.h
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #ifndef __SoObjects_WOContext_SoObjects_H__
 #define __SoObjects_WOContext_SoObjects_H__
@@ -63,6 +62,15 @@
 - (void)setPathInfo:(NSString *)_pi;
 - (NSString *)pathInfo;
 
+- (void)setRootURL:(NSString *)_url;
+- (NSString *)rootURL;
+
+- (void)setObjectPermissionCache:(id)_cache;
+- (id)objectPermissionCache;
+
+- (void)setActiveUser:(id)_user;
+- (id)activeUser;
+
 /* subcontexts */
 
 - (SoSubContext *)createSubContext;
diff --git a/sope-appserver/NGObjWeb/SoObjects/WOContext+SoObjects.m b/sope-appserver/NGObjWeb/SoObjects/WOContext+SoObjects.m
index 8dc63d64..4d018c8b 100644
--- a/sope-appserver/NGObjWeb/SoObjects/WOContext+SoObjects.m
+++ b/sope-appserver/NGObjWeb/SoObjects/WOContext+SoObjects.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: WOContext+SoObjects.m 4 2004-08-20 17:04:31Z helge $
 
 #include "WOContext+SoObjects.h"
 #include "SoObjectRequestHandler.h"
@@ -64,6 +64,24 @@ static BOOL debugOn = NO;
   return self->traversalStack;
 }
 
+- (void)setRootURL:(NSString *)_url {
+  ASSIGNCOPY(self->rootURL, _url);
+}
+- (NSString *)rootURL {
+  return self->rootURL;
+}
+
+- (id)objectPermissionCache {
+  return self->objectPermissionCache;
+}
+
+- (void)setActiveUser:(id)_user {
+  ASSIGN(self->activeUser, _user);
+}
+- (id)activeUser {
+  return self->activeUser;
+}
+
 - (void)setObjectDispatcher:(id)_dispatcher {
   ASSIGN(self->objectDispatcher, _dispatcher);
 }
diff --git a/sope-appserver/NGObjWeb/TODO b/sope-appserver/NGObjWeb/TODO
index 6c68416f..1a6764ac 100644
--- a/sope-appserver/NGObjWeb/TODO
+++ b/sope-appserver/NGObjWeb/TODO
@@ -1,6 +1,4 @@
-# $Id$
-
-- remove dependency on NGJavaScript
+# $Id: TODO 4 2004-08-20 17:04:31Z helge $
 
 - find out what the OOo WebDAV properties are supposed to do
 
@@ -30,21 +28,23 @@ Ivars
 =====
 currently stored in extended attributes or userInfo:
 - WORequest:
-  - WORequestStartDate
-  - WORequestStartProcStatistics
+  - WORequestStartDate           [done: startDate]
+  - WORequestStartProcStatistics [done: startStatistics]
 - WOComponent:
   - _ODCycleCtx (used for cursor)  TODO: isn't that a WOComponent ivar?
+    => needs to be documented and explained first
   - component definition during init (currently wosVariables)
 - WOContext
-  - SoRootURL
-  - SoObjPermCache
+  - SoRootURL      [done: rootURL]
+  - SoObjPermCache [done: objectPermissionCache]
 - WOMessage
-  - WODOMContent (cache for -contentAsDOMDocument)
+  - WODOMContent (cache for -contentAsDOMDocument) [done: domCache]
 
 Misc
 ====
 
 - WebScript, maybe using StepTalk?
+  => SOPE 5.0
 
 - catch requests to /favicon.ico
 
diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index b4b1a465..fbecef63 100644
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
-# $Id$
+# version file
 
-SUBMINOR_VERSION:=2
+SUBMINOR_VERSION:=3
 
 # v4.2.413 requires libSaxObjC      v4.2.33
 # v4.2.341 requires libNGExtensions v4.2.77
diff --git a/sope-appserver/NGObjWeb/WOContext.m b/sope-appserver/NGObjWeb/WOContext.m
index 88b19b65..a565c141 100644
--- a/sope-appserver/NGObjWeb/WOContext.m
+++ b/sope-appserver/NGObjWeb/WOContext.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include <NGObjWeb/WOContext.h>
 #include "NSObject+WO.h"
@@ -195,12 +194,15 @@ static NSString *WOApplicationSuffix = nil;
     self->deallocObservers = NULL;
   }
 #endif
-  
-  [self->traversalStack   release];
-  [self->clientObject     release];
-  [self->objectDispatcher release];
-  [self->soRequestType    release];
-  [self->pathInfo         release];
+
+  [self->activeUser            release];
+  [self->rootURL               release];
+  [self->objectPermissionCache release];
+  [self->traversalStack        release];
+  [self->clientObject          release];
+  [self->objectDispatcher      release];
+  [self->soRequestType         release];
+  [self->pathInfo              release];
   
   [[NSNotificationCenter defaultCenter]
                          postNotificationName:@"WOContextWillDeallocate"
@@ -220,13 +222,13 @@ static NSString *WOApplicationSuffix = nil;
   [self->activeFormElement release];
   [self->page              release];
   [self->awakeComponents   release];
-  [self->appURL    release];
-  [self->baseURL   release];
-  [self->session   release];
-  [self->variables release];
-  [self->request   release];
-  [self->response  release];
-  [self->ctxId     release];
+  [self->appURL            release];
+  [self->baseURL           release];
+  [self->session           release];
+  [self->variables         release];
+  [self->request           release];
+  [self->response          release];
+  [self->ctxId             release];
   [super dealloc];
 }
 
diff --git a/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m b/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
index 115bec14..3a9832b3 100644
--- a/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
+++ b/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: WOHttpTransaction.m 4 2004-08-20 17:04:31Z helge $
 
 #include "WOHttpTransaction.h"
 #include "WORecordRequestStream.h"
@@ -860,10 +860,9 @@ static __inline__ const unsigned char *monthAbbr(int m) {
   NSDate         *lstartDate;
   NSDictionary   *startStats;
   
-  lstartDate = [[_request  userInfo] objectForKey:@"WORequestStartDate"];
-  startStats =
-    [[_request userInfo] objectForKey:@"WORequestStartProcStatistics"];
-  zippedLen = [[_response userInfo] objectForKey:@"WOResponseZippedLength"];
+  lstartDate = [_request startDate];
+  startStats = [_request startStatistics];
+  zippedLen  = [[_response userInfo] objectForKey:@"WOResponseZippedLength"];
   
   // host and date
   if ((remoteHost = [_request headerForKey:@"x-webobjects-remote-host"]))
diff --git a/sope-appserver/NGObjWeb/WOHttpAdaptor/WORequest+Adaptor.m b/sope-appserver/NGObjWeb/WOHttpAdaptor/WORequest+Adaptor.m
index 12bea1c1..fe14f497 100644
--- a/sope-appserver/NGObjWeb/WOHttpAdaptor/WORequest+Adaptor.m
+++ b/sope-appserver/NGObjWeb/WOHttpAdaptor/WORequest+Adaptor.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "WORequest+Adaptor.h"
 #include "common.h"
@@ -30,24 +29,14 @@
 }
 
 - (void)takeStartDate:(NSDate *)_startDate {
-  NSMutableDictionary *ud;
   static NSProcessInfo *pi = nil;
   id tmp;
   
   if (pi == nil) pi = [[NSProcessInfo processInfo] retain];
   
-  if ((ud = (id)[self userInfo]))
-    ud = [ud mutableCopy];
-  else
-    ud = [[NSMutableDictionary alloc] initWithCapacity:4];
-  
-  if (_startDate) [ud setObject:_startDate forKey:@"WORequestStartDate"];
-  
   tmp = [pi procStatDictionary];
-  if (tmp) [ud setObject:tmp forKey:@"WORequestStartProcStatistics"];
-  
-  [self setUserInfo:ud];
-  [ud release];
+  ASSIGN(self->startDate,       _startDate);
+  ASSIGN(self->startStatistics, tmp);
 }
 
 @end /* WORequest(TakeStartDate) */
diff --git a/sope-appserver/NGObjWeb/WOMessage+XML.m b/sope-appserver/NGObjWeb/WOMessage+XML.m
index ac0eff52..0a4e398c 100644
--- a/sope-appserver/NGObjWeb/WOMessage+XML.m
+++ b/sope-appserver/NGObjWeb/WOMessage+XML.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,10 +18,8 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include <NGObjWeb/WOMessage.h>
-//#include <DOM/EDOM.h>
 #include "common.h"
 
 @interface NSObject(DOMXML)
@@ -39,47 +37,25 @@
   NSData *data;
   id     dom;
   
-  if ((dom = [[self userInfo] objectForKey:@"WODOMContent"]) == nil) {
+  if ((dom = self->domCache) == nil) {
     [self setContent:nil];
     return;
   }
   
-  outputter = [[NSClassFromString(@"DOMXMLOutputter") alloc] init];
-  AUTORELEASE(outputter);
-
+  outputter =
+    [[[NSClassFromString(@"DOMXMLOutputter") alloc] init] autorelease];
+  
   ms = [NSMutableString stringWithCapacity:2048];
   [outputter outputDocument:dom to:ms];
-    
+  
   data = [ms dataUsingEncoding:NSUTF8StringEncoding];
 
   [self setContent:data];
 }
 
 - (void)setContentDOMDocument:(id)_dom {
-  if (_dom == nil) {
-    if ((_dom = [[self userInfo] objectForKey:@"WODOMContent"])) {
-      NSMutableDictionary *ui;
-
-      ui = [[self userInfo] mutableCopy];
-      [ui removeObjectForKey:@"WODOMContent"];
-      [self setUserInfo:ui];
-      RELEASE(ui); ui = nil;
-    }
-    [self _rebuildDOMDataContent];
-    return;
-  }
-  else {
-    NSMutableDictionary *ui;
-    
-    /* cache DOM structure in userInfo */
-    ui = [[self userInfo] mutableCopy];
-    if (ui == nil) ui = [[NSMutableDictionary alloc] initWithCapacity:2];
-    [ui setObject:_dom forKey:@"WODOMContent"];
-    [self setUserInfo:ui];
-    RELEASE(ui); ui = nil;
-
-    [self _rebuildDOMDataContent];
-  }
+  ASSIGN(self->domCache, _dom);
+  [self _rebuildDOMDataContent];
 }
 
 - (void)appendContentDOMDocumentFragment:(id)_domfrag {
@@ -101,26 +77,19 @@
   NSData *data;
   id dom;
   
-  if ((dom = [[self userInfo] objectForKey:@"WODOMContent"]))
+  if ((dom = self->domCache) != nil)
     return dom;
   
-  if ((data = [self content])) {
+  if ((data = [self content]) != nil) {
     id builder;
     
     builder = [[[NSClassFromString(@"DOMSaxBuilder") alloc] init] autorelease];
-    
     dom = [[builder buildFromData:data] retain];
   }
   
-  /* cache DOM structure in userInfo */
-  if (dom) {
-    NSMutableDictionary *ui;
-    
-    ui = [[self userInfo] mutableCopy];
-    if (ui == nil) ui = [[NSMutableDictionary alloc] initWithCapacity:2];
-    [ui setObject:dom forKey:@"WODOMContent"];
-    [self setUserInfo:ui];
-    RELEASE(ui); ui = nil;
+  /* cache DOM structure */
+  if (dom != nil) {
+    ASSIGN(self->domCache, dom);
   }
   return dom;
 }
diff --git a/sope-appserver/NGObjWeb/WOMessage.m b/sope-appserver/NGObjWeb/WOMessage.m
index 3f9f66e4..08350006 100644
--- a/sope-appserver/NGObjWeb/WOMessage.m
+++ b/sope-appserver/NGObjWeb/WOMessage.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: WOMessage.m 4 2004-08-20 17:04:31Z helge $
 
 #include <NGObjWeb/WOMessage.h>
 #include <NGExtensions/NGHashMap.h>
@@ -80,7 +80,7 @@ static __inline__ NSMutableData *_checkBody(WOMessage *self) {
 }
 
 + (int)version {
-  return 4;
+  return 5;
 }
 
 + (void)setDefaultEncoding:(NSStringEncoding)_encoding {
@@ -110,6 +110,7 @@ static __inline__ NSMutableData *_checkBody(WOMessage *self) {
 }
 
 - (void)dealloc {
+  [self->domCache      release];
   [self->contentStream release];
   [self->cookies  release];
   [self->version  release];
diff --git a/sope-appserver/NGObjWeb/WORequest.m b/sope-appserver/NGObjWeb/WORequest.m
index ad781504..0f17c3b7 100644
--- a/sope-appserver/NGObjWeb/WORequest.m
+++ b/sope-appserver/NGObjWeb/WORequest.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: WORequest.m 4 2004-08-20 17:04:31Z helge $
 
 #include <NGObjWeb/WORequest.h>
 #include <NGObjWeb/WOSession.h>
@@ -51,7 +51,7 @@ NGObjWeb_DECLARE NSString *WONoSelectionString      = @"WONoSelectionString";
 static BOOL debugOn = NO;
 
 + (int)version {
-  return [super version] + 1 /* v5 */;
+  return [super version] + 2 /* v7 */;
 }
 
 + (NSString *)lookupLanguagesPlist {
@@ -257,16 +257,16 @@ static BOOL debugOn = NO;
 }
 
 - (void)dealloc {
-  [self->method release];
-  [self->_uri   release];
-  
+  [self->startDate          release];
+  [self->startStatistics    release];
+  [self->method             release];
+  [self->_uri               release];
   [self->adaptorPrefix      release];
   [self->requestHandlerKey  release];
   [self->requestHandlerPath release];
   [self->appName            release];
-  
-  [self->formContent release];
-  [self->request     release];
+  [self->formContent        release];
+  [self->request            release];
   [super dealloc];
 }
 
@@ -385,7 +385,17 @@ static BOOL debugOn = NO;
   return [[self uri] isAbsoluteURL];
 }
 
-// ******************** Forms ********************
+- (void)setStartDate:(NSCalendarDate *)_startDate {
+  ASSIGNCOPY(self->startDate, _startDate);
+}
+- (NSCalendarDate *)startDate {
+  return self->startDate;
+}
+- (id)startStatistics {
+  return self->startStatistics;
+}
+
+/* forms */
 
 - (NSStringEncoding)formValueEncoding {
   return NSUTF8StringEncoding;
diff --git a/sope-appserver/NGObjWeb/WOResponse.m b/sope-appserver/NGObjWeb/WOResponse.m
index 411bcb00..14cc4dda 100644
--- a/sope-appserver/NGObjWeb/WOResponse.m
+++ b/sope-appserver/NGObjWeb/WOResponse.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include <NGObjWeb/WOResponse.h>
 #include <NGObjWeb/WORequest.h>
@@ -36,7 +35,7 @@ static BOOL          dontZip  = NO;
 static BOOL          debugZip = NO;
 
 + (int)version {
-  return [super version] + 1 /* v5 */;
+  return [super version] + 1 /* v6 */;
 }
 + (void)initialize {
   NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
diff --git a/sope-appserver/NGObjWeb/WOStatisticsStore.m b/sope-appserver/NGObjWeb/WOStatisticsStore.m
index ed2e9e1f..48afd37a 100644
--- a/sope-appserver/NGObjWeb/WOStatisticsStore.m
+++ b/sope-appserver/NGObjWeb/WOStatisticsStore.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: WOStatisticsStore.m 4 2004-08-20 17:04:31Z helge $
 
 #include <NGObjWeb/WOStatisticsStore.h>
 #include <NGObjWeb/WORequest.h>
@@ -274,8 +274,7 @@ static id mkdbl(double d) {
   else
     size = [[_response content] length];
   
-  requestStartDate =
-    [[[_context request] userInfo] objectForKey:@"WORequestStartDate"];
+  requestStartDate = [[_context request] startDate];
   now = [NSDate date];
   
   duration = (requestStartDate)
@@ -419,8 +418,7 @@ static id mkdbl(double d) {
   [result appendFormat:@"%i %i",
             [_response status], [[_response content] length]];
   
-  startDate = [[request userInfo] objectForKey:@"WORequestStartDate"];
-  if (startDate) {
+  if ((startDate = [request startDate]) != nil) {
     NSTimeInterval duration;
     
     duration = [now timeIntervalSinceDate:startDate];
diff --git a/sope-appserver/SoOFS/ChangeLog b/sope-appserver/SoOFS/ChangeLog
new file mode 100644
index 00000000..373d947c
--- /dev/null
+++ b/sope-appserver/SoOFS/ChangeLog
@@ -0,0 +1,154 @@
+2004-08-22  Helge Hess  <helge.hess@opengroupware.org>
+
+	* v4.3.1
+	
+	* moved the SoOFS library/sope tool to a separate project
+
+2004-05-16  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* SoOFS/SoOFS-SXP-Info.plist, SoObjects/SoCore-SXP-Info.plist: new
+	  entries for Xcode build (v4.2.370)
+
+2004-04-30  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* SoOFS/OFSFolderDataSource.m: didn't work at all when no qualifier
+	  was set (v4.2.358)
+
+2004-02-10  Helge Hess  <helge.hess@opengroupware.org>
+	
+	* SoOFS/OFSFileRenderer.m: do not use -initWithTimeIntervalSince1970:
+	  on MacOSX (deprecated in Cocoa)
+
+2003-10-31  Helge Hess  <helge.hess@opengroupware.org>
+
+	* SoOFS/OFSFolder+SoDAV.m: fixed a warning
+
+2003-10-29  Helge Hess  <helge.hess@skyrix.com>
+
+	* SoOFS/OFSFolder+SoDAV.m: added capability to create collections
+
+2003-10-15  Helge Hess  <helge.hess@opengroupware.org>
+
+	* SoOFS/OFSFolder.m: generalized authenticator lookup
+
+	* SoOFS/OFSBaseObject.m: avoid endless recursions in 
+	  -authenticatorInContext:
+	
+2003-10-11  Helge Hess  <helge.hess@skyrix.com>
+
+	* SoOFS: added a folder datasource class for querying contents of an
+	  OFS folder and a "contentDataSource" method
+
+	* SoOFS/OFSFile.m: moved renderer selection to 
+	  SoRequestDispatcherRules
+
+	* SoOFS/product.plist: set default access of OFSImage and 
+	  OFSPropertyListObject to allow, so that acquisition works when we
+	  lookup a template on the object
+
+	* SoOFS/OFSResourceManager.m: improved debug logging in error cases
+
+2003-09-06  Marcus Mueller <znek@mulle-kybernetik.com>
+
+	* SoOFS/OFSHttpPasswd.m: Include <unistd.h> for crypt if on Apple
+	  or FreeBSD. A quick glimpse revealed that the system gcc (3.2) on
+	  FreeBSD 5.x doesn't define __FreeBSD__ which is most likely a bug
+	  and should be reported. On FreeBSD 4.x everything's as expected.
+
+2003-08-04  Helge Hess  <helge.hess@skyrix.com>
+
+	* SoOFS/OFSHttpPasswd.m: include des.h instead of crypt.h on OpenBSD
+	  (pointed out by Max Berger, thanks!)
+
+2003-05-31  Helge Hess  <helge.hess@skyrix.com>
+	
+	* SoOFS/OFSFolder.m: fixed calculation of default-method URI when
+	  given a URI with a query-string (v4.2.195)
+
+2003-05-30  Helge Hess  <helge.hess@skyrix.com>
+	
+	* SoOFS/OFSWebMethod.m: added support for POSTs (calls takeValues on
+	  the component before returning it)
+
+2003-05-26  Helge Hess  <helge.hess@skyrix.com>
+	
+	* SoObjects/SoOFS: major fixes to "clientObject" handling
+	
+	* SoOFS: added OFSWebDocument, map 'xhtml' extension to OFSWebDocument
+	
+	* SoOFS: prepared classes for ChangeLog files and htpasswd files
+
+	* SoOFS/OFSFactoryRegistry.m: allow file extensions to determine 
+	  folder factory, added exact-name support
+
+2003-05-23  Helge Hess  <helge.hess@skyrix.com>
+	
+	* SoOFS: added methods to detect version control systems (v4.2.187)
+
+	* SoOFS: added OFSWebTemplate handler for xtmpl templates
+
+	* SoOFS/OFSResourceManager.m: uses -traverseKey with a subcontext to
+	  acquire resources, added logging (SoOFSResourceManagerDebugEnabled)
+
+2003-05-21  Helge Hess  <helge.hess@skyrix.com>
+
+	* SoOFS/OFSFileRenderer.m: changed to be a fully compliant renderer,
+	  now also does the actual rendering (moved in code from OFSFile)
+	
+	* SoOFS/OFSWebMethod.m: moved OFSWebMethodRenderer to separate file
+	
+	* SoOFS/OFSWebMethod.m: added specialized renderer for OFSWebMethod
+
+2003-05-10  Helge Hess  <helge.hess@skyrix.com>
+
+	* SoOFS/OFSFile.m: return self on GET, use a renderer
+
+	* SoOFS/OFSFile.m: added support for HEAD, cleaned up rendering (still
+	  needs more work ...)
+
+	* SoOFS/OFSWebMethod.m: added OFSWebMethodDebugEnabled default to
+	  trigger debug logging, fixed a bug in component caching
+
+2003-04-15  Helge Hess  <helge.hess@skyrix.com>
+
+	* added 'sope' tool for hosting SoOFS based SOPE applications
+
+2003-01-14  Helge Hess  <helge.hess@skyrix.com>
+	
+	* SoOFS/OFSPropertyListObject.m: improved factory and -saveObject to be
+	  able to deal with new objects
+	
+	* SoOFS/OFSFactoryContext, OFSFolder: added a context creation method
+	  for objects that do not yet exist in the store
+
+2003-01-07  Helge Hess  <helge.hess@skyrix.com>
+
+	* SoOFS/OFSFactoryRegistry.m: added some code to allow SoClass'es 
+	  behave as factories (located using the extension manifest key)
+
+	* SoOFS/OFSFolder.m: move factory method to a separate category
+	
+	* SoOFS/OFSResourceManager.m: fixed some compilation warnings
+	
+	* SoOFS/OFSBaseObject.m: return nil for unbound keys (OSX)
+
+2002-12-18  Helge Hess  <helge.hess@skyrix.com>
+
+	* SoOFS/OFSFolder.m: fixed a typo
+
+2002-12-11  Helge Hess  <helge.hess@skyrix.com>
+	
+	* SoOFS/OFSFile.m: added a generic "writeState:" method
+
+2002-11-22  Helge Hess  <helge.hess@skyrix.com>
+	
+	* SoOFS: cleanup of OFS storage system (v4.2.94)
+
+2002-11-17  Helge Hess  <helge.hess@skyrix.com>
+
+	* SoOFS: authenticator object is now local to the object and
+	  acquired using the container (v4.2.81)
+
+2002-11-14  Helge Hess  <helge.hess@skyrix.com>
+		
+	* added first version of SoOFS (v4.2.75)
diff --git a/sope-appserver/NGObjWeb/SoOFS/GNUmakefile b/sope-appserver/SoOFS/GNUmakefile
similarity index 55%
rename from sope-appserver/NGObjWeb/SoOFS/GNUmakefile
rename to sope-appserver/SoOFS/GNUmakefile
index 5fff25f0..af55b35e 100644
--- a/sope-appserver/NGObjWeb/SoOFS/GNUmakefile
+++ b/sope-appserver/SoOFS/GNUmakefile
@@ -1,13 +1,13 @@
-# $Id$
+# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
-SUBPROJECT_NAME = SoOFS
+LIBRARY_NAME = libSoOFS
 
-SoOFS_HEADER_FILES_DIR         = .
-SoOFS_HEADER_FILES_INSTALL_DIR = /SoOFS
+libSoOFS_HEADER_FILES_DIR         = .
+libSoOFS_HEADER_FILES_INSTALL_DIR = /SoOFS
 
-SoOFS_HEADER_FILES = \
+libSoOFS_HEADER_FILES = \
 	SoOFS.h			\
 	OFSBaseObject.h		\
 	OFSFactoryContext.h	\
@@ -26,7 +26,7 @@ SoOFS_HEADER_FILES = \
 	OFSChangeLog.h		\
 	OFSFolderDataSource.h	\
 
-SoOFS_OBJC_FILES = \
+libSoOFS_OBJC_FILES = \
 	OFSBaseObject.m			\
 	OFSFactoryContext.m		\
 	OFSFactoryRegistry.m		\
@@ -46,8 +46,24 @@ SoOFS_OBJC_FILES = \
 	OFSChangeLog.m			\
 	OFSFolderDataSource.m		\
 
-#SoOFS_RESOURCE_FILES =
+# ----- SoCore product for SOPE core registrations
+
+BUNDLE_NAME      = SoOFS
+BUNDLE_EXTENSION = .sxp
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts
+
+SoOFS_OBJC_FILES       = SoOFSProduct.m
+SoOFS_RESOURCE_FILES   = product.plist Version
+SoOFS_PRINCIPAL_CLASS  = SoOFSProduct
+
+# ----- NGObjWeb tools
+
+TOOL_NAME = sope
+
+sope_OBJC_FILES = sope.m
 
 -include GNUmakefile.preamble
-include $(GNUSTEP_MAKEFILES)/subproject.make
+include $(GNUSTEP_MAKEFILES)/library.make
+include $(GNUSTEP_MAKEFILES)/bundle.make
+include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
diff --git a/sope-appserver/SoOFS/GNUmakefile.preamble b/sope-appserver/SoOFS/GNUmakefile.preamble
new file mode 100644
index 00000000..21a66b1b
--- /dev/null
+++ b/sope-appserver/SoOFS/GNUmakefile.preamble
@@ -0,0 +1,73 @@
+# $Id: GNUmakefile.preamble 14 2004-08-20 21:07:18Z helge $
+
+ADDITIONAL_CPPFLAGS += -Wall -DCOMPILE_FOR_GSTEP_MAKE=1
+ADDITIONAL_OBJCFLAGS += -Wall -Wno-import -Wno-protocol
+
+SOPE_ROOT=../..
+CORE_ROOT=$(SOPE_ROOT)/sope-core
+
+ADDITIONAL_INCLUDE_DIRS += \
+	-I.			\
+	-I..			\
+	-I../NGObjWeb		\
+	-I../NGObjWeb/SoObjects	\
+	-I../NGObjWeb/WebDAV	\
+	-I$(CORE_ROOT)		\
+	-I$(CORE_ROOT)/NGStreams/	\
+	-I$(CORE_ROOT)/NGExtensions	\
+	-I$(SOPE_ROOT)/sope-xml
+
+
+libSoOFS_LIBRARIES_DEPEND_UPON += \
+	-lNGObjWeb -lNGScripting			\
+	-lNGMime -lNGStreams -lNGExtensions -lEOControl	\
+	-lXmlRpc -lDOM -lSaxObjC
+
+sope_TOOL_LIBS += \
+	-lSoOFS -lNGObjWeb -lNGScripting		\
+	-lNGMime -lNGStreams -lNGExtensions -lEOControl \
+	-lXmlRpc -lDOM -lSaxObjC
+
+ifneq ($(GNUSTEP_BUILD_DIR),)
+RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/..
+RELBUILD_DIR_MIME=$(GNUSTEP_BUILD_DIR)/../../sope-mime
+RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/$(CORE_ROOT)
+RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
+
+ADDITIONAL_LIB_DIRS += \
+	-L$(GNUSTEP_OBJ_DIR)						\
+	-L$(RELBUILD_DIR_SOPE)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME)		\
+	-L$(RELBUILD_DIR_SOPE)/NGScripting/$(GNUSTEP_OBJ_DIR_NAME)	\
+	-L$(RELBUILD_DIR_MIME)/NGMime/$(GNUSTEP_OBJ_DIR_NAME)		\
+	-L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME)	\
+	-L$(RELBUILD_DIR_SxCore)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME)	\
+	-L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME)	\
+	-L$(RELBUILD_DIR_SxXml)/XmlRpc/$(GNUSTEP_OBJ_DIR_NAME)		\
+	-L$(RELBUILD_DIR_SxXml)/DOM/$(GNUSTEP_OBJ_DIR_NAME)		\
+	-L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)		\
+	-L$(RELBUILD_DIR_JS)/$(GNUSTEP_OBJ_DIR_NAME)
+
+else
+ADDITIONAL_LIB_DIRS += \
+	-L./$(GNUSTEP_OBJ_DIR)					\
+	-L../NGObjWeb/$(GNUSTEP_OBJ_DIR)			\
+	-L../NGScripting/$(GNUSTEP_OBJ_DIR)			\
+	-L$(SOPE_ROOT)/sope-mime/$(GNUSTEP_OBJ_DIR)		\
+	-L$(CORE_ROOT)/NGStreams/$(GNUSTEP_OBJ_DIR)		\
+	-L$(CORE_ROOT)/NGExtensions/$(GNUSTEP_OBJ_DIR)		\
+	-L$(CORE_ROOT)/EOControl/$(GNUSTEP_OBJ_DIR)		\
+	-L$(SOPE_ROOT)/sope-xml/XmlRpc/$(GNUSTEP_OBJ_DIR)	\
+	-L$(SOPE_ROOT)/sope-xml/DOM/$(GNUSTEP_OBJ_DIR)		\
+	-L$(SOPE_ROOT)/sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
+endif
+
+
+# platform specific settings
+
+ifneq ($(findstring openbsd3, $(GNUSTEP_TARGET_OS)), openbsd3)
+# OpenBSD does not require libcrypt
+ifneq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin)
+# and neither does MacOSX? ...
+sope_TOOL_LIBS += -lcrypt
+endif
+endif
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSBaseObject.h b/sope-appserver/SoOFS/OFSBaseObject.h
similarity index 98%
rename from sope-appserver/NGObjWeb/SoOFS/OFSBaseObject.h
rename to sope-appserver/SoOFS/OFSBaseObject.h
index 6329f3bf..bab0fd52 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSBaseObject.h
+++ b/sope-appserver/SoOFS/OFSBaseObject.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSBaseObject.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __OFS_OFSBaseObject_H__
 #define __OFS_OFSBaseObject_H__
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSBaseObject.m b/sope-appserver/SoOFS/OFSBaseObject.m
similarity index 99%
rename from sope-appserver/NGObjWeb/SoOFS/OFSBaseObject.m
rename to sope-appserver/SoOFS/OFSBaseObject.m
index 9032ca0d..42218e3c 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSBaseObject.m
+++ b/sope-appserver/SoOFS/OFSBaseObject.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSBaseObject.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSBaseObject.h"
 #include "OFSFactoryContext.h"
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSChangeLog.h b/sope-appserver/SoOFS/OFSChangeLog.h
similarity index 95%
rename from sope-appserver/NGObjWeb/SoOFS/OFSChangeLog.h
rename to sope-appserver/SoOFS/OFSChangeLog.h
index c275962a..b868f81b 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSChangeLog.h
+++ b/sope-appserver/SoOFS/OFSChangeLog.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSChangeLog.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __SoOFS_OFSChangeLog_H__
 #define __SoOFS_OFSChangeLog_H__
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSChangeLog.m b/sope-appserver/SoOFS/OFSChangeLog.m
similarity index 94%
rename from sope-appserver/NGObjWeb/SoOFS/OFSChangeLog.m
rename to sope-appserver/SoOFS/OFSChangeLog.m
index b71b650f..1b5b46a8 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSChangeLog.m
+++ b/sope-appserver/SoOFS/OFSChangeLog.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSChangeLog.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSChangeLog.h"
 #include "common.h"
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSFactoryContext.h b/sope-appserver/SoOFS/OFSFactoryContext.h
similarity index 97%
rename from sope-appserver/NGObjWeb/SoOFS/OFSFactoryContext.h
rename to sope-appserver/SoOFS/OFSFactoryContext.h
index d84f588a..3892bb06 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSFactoryContext.h
+++ b/sope-appserver/SoOFS/OFSFactoryContext.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSFactoryContext.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __OFS_OFSFactoryContext_H__
 #define __OFS_OFSFactoryContext_H__
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSFactoryContext.m b/sope-appserver/SoOFS/OFSFactoryContext.m
similarity index 98%
rename from sope-appserver/NGObjWeb/SoOFS/OFSFactoryContext.m
rename to sope-appserver/SoOFS/OFSFactoryContext.m
index d8eb5073..6cb4c37a 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSFactoryContext.m
+++ b/sope-appserver/SoOFS/OFSFactoryContext.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSFactoryContext.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSFactoryContext.h"
 #include "OFSFolder.h"
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSFactoryRegistry.h b/sope-appserver/SoOFS/OFSFactoryRegistry.h
similarity index 97%
rename from sope-appserver/NGObjWeb/SoOFS/OFSFactoryRegistry.h
rename to sope-appserver/SoOFS/OFSFactoryRegistry.h
index b4c45458..ba41e887 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSFactoryRegistry.h
+++ b/sope-appserver/SoOFS/OFSFactoryRegistry.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSFactoryRegistry.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __OFS_OFSFactoryRegistry_H__
 #define __OFS_OFSFactoryRegistry_H__
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSFactoryRegistry.m b/sope-appserver/SoOFS/OFSFactoryRegistry.m
similarity index 99%
rename from sope-appserver/NGObjWeb/SoOFS/OFSFactoryRegistry.m
rename to sope-appserver/SoOFS/OFSFactoryRegistry.m
index c523d177..844d5008 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSFactoryRegistry.m
+++ b/sope-appserver/SoOFS/OFSFactoryRegistry.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSFactoryRegistry.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSFactoryRegistry.h"
 #include "OFSFolder.h"
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSFile.h b/sope-appserver/SoOFS/OFSFile.h
similarity index 97%
rename from sope-appserver/NGObjWeb/SoOFS/OFSFile.h
rename to sope-appserver/SoOFS/OFSFile.h
index 83e97955..d3e0f0df 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSFile.h
+++ b/sope-appserver/SoOFS/OFSFile.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSFile.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __OFS_OFSFile_H__
 #define __OFS_OFSFile_H__
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSFile.m b/sope-appserver/SoOFS/OFSFile.m
similarity index 99%
rename from sope-appserver/NGObjWeb/SoOFS/OFSFile.m
rename to sope-appserver/SoOFS/OFSFile.m
index 07e860cb..dafa1899 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSFile.m
+++ b/sope-appserver/SoOFS/OFSFile.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSFile.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSFile.h"
 #include "OFSFolder.h"
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSFileRenderer.h b/sope-appserver/SoOFS/OFSFileRenderer.h
similarity index 95%
rename from sope-appserver/NGObjWeb/SoOFS/OFSFileRenderer.h
rename to sope-appserver/SoOFS/OFSFileRenderer.h
index de872942..4ff1b59c 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSFileRenderer.h
+++ b/sope-appserver/SoOFS/OFSFileRenderer.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSFileRenderer.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __SoOFS_OFSFileRenderer_H__
 #define __SoOFS_OFSFileRenderer_H__
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSFileRenderer.m b/sope-appserver/SoOFS/OFSFileRenderer.m
similarity index 98%
rename from sope-appserver/NGObjWeb/SoOFS/OFSFileRenderer.m
rename to sope-appserver/SoOFS/OFSFileRenderer.m
index a3adc152..317dfa32 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSFileRenderer.m
+++ b/sope-appserver/SoOFS/OFSFileRenderer.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSFileRenderer.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSFileRenderer.h"
 #include "OFSFile.h"
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSFolder+SoDAV.m b/sope-appserver/SoOFS/OFSFolder+SoDAV.m
similarity index 98%
rename from sope-appserver/NGObjWeb/SoOFS/OFSFolder+SoDAV.m
rename to sope-appserver/SoOFS/OFSFolder+SoDAV.m
index 26fb8ba3..421654f3 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSFolder+SoDAV.m
+++ b/sope-appserver/SoOFS/OFSFolder+SoDAV.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSFolder+SoDAV.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSFolder.h"
 #include "common.h"
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSFolder.h b/sope-appserver/SoOFS/OFSFolder.h
similarity index 98%
rename from sope-appserver/NGObjWeb/SoOFS/OFSFolder.h
rename to sope-appserver/SoOFS/OFSFolder.h
index e62496ba..ea01ea5b 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSFolder.h
+++ b/sope-appserver/SoOFS/OFSFolder.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSFolder.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __OFS_OFSFolder_H__
 #define __OFS_OFSFolder_H__
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSFolder.m b/sope-appserver/SoOFS/OFSFolder.m
similarity index 99%
rename from sope-appserver/NGObjWeb/SoOFS/OFSFolder.m
rename to sope-appserver/SoOFS/OFSFolder.m
index f76f853e..907f500a 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSFolder.m
+++ b/sope-appserver/SoOFS/OFSFolder.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSFolder.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSFolder.h"
 #include "OFSFile.h"
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSFolderClassDescription.h b/sope-appserver/SoOFS/OFSFolderClassDescription.h
similarity index 95%
rename from sope-appserver/NGObjWeb/SoOFS/OFSFolderClassDescription.h
rename to sope-appserver/SoOFS/OFSFolderClassDescription.h
index bb0e553a..902ba756 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSFolderClassDescription.h
+++ b/sope-appserver/SoOFS/OFSFolderClassDescription.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSFolderClassDescription.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __SoOFS_OFSFolderClassDescription_H__
 #define __SoOFS_OFSFolderClassDescription_H__
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSFolderClassDescription.m b/sope-appserver/SoOFS/OFSFolderClassDescription.m
similarity index 95%
rename from sope-appserver/NGObjWeb/SoOFS/OFSFolderClassDescription.m
rename to sope-appserver/SoOFS/OFSFolderClassDescription.m
index ac6dbe0d..d34f2599 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSFolderClassDescription.m
+++ b/sope-appserver/SoOFS/OFSFolderClassDescription.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSFolderClassDescription.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSFolderClassDescription.h"
 #include "OFSFolder.h"
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSFolderDataSource.h b/sope-appserver/SoOFS/OFSFolderDataSource.h
similarity index 88%
rename from sope-appserver/NGObjWeb/SoOFS/OFSFolderDataSource.h
rename to sope-appserver/SoOFS/OFSFolderDataSource.h
index 6203f55b..25bcbed7 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSFolderDataSource.h
+++ b/sope-appserver/SoOFS/OFSFolderDataSource.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: OFSFolderDataSource.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __SoOFS_OFSFolderDataSource_H__
 #define __SoOFS_OFSFolderDataSource_H__
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSFolderDataSource.m b/sope-appserver/SoOFS/OFSFolderDataSource.m
similarity index 98%
rename from sope-appserver/NGObjWeb/SoOFS/OFSFolderDataSource.m
rename to sope-appserver/SoOFS/OFSFolderDataSource.m
index d0b244db..b1015f68 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSFolderDataSource.m
+++ b/sope-appserver/SoOFS/OFSFolderDataSource.m
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: OFSFolderDataSource.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSFolderDataSource.h"
 #include <EOControl/EOQualifier.h>
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSHttpPasswd.h b/sope-appserver/SoOFS/OFSHttpPasswd.h
similarity index 96%
rename from sope-appserver/NGObjWeb/SoOFS/OFSHttpPasswd.h
rename to sope-appserver/SoOFS/OFSHttpPasswd.h
index f4826966..e206c560 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSHttpPasswd.h
+++ b/sope-appserver/SoOFS/OFSHttpPasswd.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSHttpPasswd.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __SoOFS_OFSHttpPasswd_H__
 #define __SoOFS_OFSHttpPasswd_H__
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSHttpPasswd.m b/sope-appserver/SoOFS/OFSHttpPasswd.m
similarity index 98%
rename from sope-appserver/NGObjWeb/SoOFS/OFSHttpPasswd.m
rename to sope-appserver/SoOFS/OFSHttpPasswd.m
index 8556808c..cf463c3b 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSHttpPasswd.m
+++ b/sope-appserver/SoOFS/OFSHttpPasswd.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSHttpPasswd.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSHttpPasswd.h"
 #include "SoHTTPAuthenticator.h"
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSImage.h b/sope-appserver/SoOFS/OFSImage.h
similarity index 95%
rename from sope-appserver/NGObjWeb/SoOFS/OFSImage.h
rename to sope-appserver/SoOFS/OFSImage.h
index 2f5750f5..5f0e5189 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSImage.h
+++ b/sope-appserver/SoOFS/OFSImage.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSImage.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __OFS_OFSImage_H__
 #define __OFS_OFSImage_H__
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSImage.m b/sope-appserver/SoOFS/OFSImage.m
similarity index 96%
rename from sope-appserver/NGObjWeb/SoOFS/OFSImage.m
rename to sope-appserver/SoOFS/OFSImage.m
index e44fdc1c..1e8651ec 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSImage.m
+++ b/sope-appserver/SoOFS/OFSImage.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSImage.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSImage.h"
 #include "common.h"
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSPropertyListObject.h b/sope-appserver/SoOFS/OFSPropertyListObject.h
similarity index 96%
rename from sope-appserver/NGObjWeb/SoOFS/OFSPropertyListObject.h
rename to sope-appserver/SoOFS/OFSPropertyListObject.h
index 164964d5..acdcb222 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSPropertyListObject.h
+++ b/sope-appserver/SoOFS/OFSPropertyListObject.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSPropertyListObject.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __OFS_OFSPropertyListObject_H__
 #define __OFS_OFSPropertyListObject_H__
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSPropertyListObject.m b/sope-appserver/SoOFS/OFSPropertyListObject.m
similarity index 99%
rename from sope-appserver/NGObjWeb/SoOFS/OFSPropertyListObject.m
rename to sope-appserver/SoOFS/OFSPropertyListObject.m
index 516a7117..68aa3d2d 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSPropertyListObject.m
+++ b/sope-appserver/SoOFS/OFSPropertyListObject.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSPropertyListObject.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSPropertyListObject.h"
 #include "OFSFactoryContext.h"
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSResourceManager.h b/sope-appserver/SoOFS/OFSResourceManager.h
similarity index 96%
rename from sope-appserver/NGObjWeb/SoOFS/OFSResourceManager.h
rename to sope-appserver/SoOFS/OFSResourceManager.h
index 989f09c5..74583ac0 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSResourceManager.h
+++ b/sope-appserver/SoOFS/OFSResourceManager.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSResourceManager.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __SoOFS_OFSResourceManager_H__
 #define __SoOFS_OFSResourceManager_H__
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSResourceManager.m b/sope-appserver/SoOFS/OFSResourceManager.m
similarity index 98%
rename from sope-appserver/NGObjWeb/SoOFS/OFSResourceManager.m
rename to sope-appserver/SoOFS/OFSResourceManager.m
index 279b30ed..560583fb 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSResourceManager.m
+++ b/sope-appserver/SoOFS/OFSResourceManager.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSResourceManager.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSResourceManager.h"
 #include "OFSBaseObject.h"
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSWebDocument.h b/sope-appserver/SoOFS/OFSWebDocument.h
similarity index 95%
rename from sope-appserver/NGObjWeb/SoOFS/OFSWebDocument.h
rename to sope-appserver/SoOFS/OFSWebDocument.h
index 28317ba4..b509a11c 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSWebDocument.h
+++ b/sope-appserver/SoOFS/OFSWebDocument.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSWebDocument.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __SoOFS_OFSWebDocument_H__
 #define __SoOFS_OFSWebDocument_H__
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSWebDocument.m b/sope-appserver/SoOFS/OFSWebDocument.m
similarity index 95%
rename from sope-appserver/NGObjWeb/SoOFS/OFSWebDocument.m
rename to sope-appserver/SoOFS/OFSWebDocument.m
index cb7eff26..8757d8a8 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSWebDocument.m
+++ b/sope-appserver/SoOFS/OFSWebDocument.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSWebDocument.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSWebDocument.h"
 #include "common.h"
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSWebMethod.h b/sope-appserver/SoOFS/OFSWebMethod.h
similarity index 96%
rename from sope-appserver/NGObjWeb/SoOFS/OFSWebMethod.h
rename to sope-appserver/SoOFS/OFSWebMethod.h
index 8fff587f..ba4cf234 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSWebMethod.h
+++ b/sope-appserver/SoOFS/OFSWebMethod.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSWebMethod.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __OFS_OFSWebMethod_H__
 #define __OFS_OFSWebMethod_H__
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSWebMethod.m b/sope-appserver/SoOFS/OFSWebMethod.m
similarity index 99%
rename from sope-appserver/NGObjWeb/SoOFS/OFSWebMethod.m
rename to sope-appserver/SoOFS/OFSWebMethod.m
index 75a84b61..6d34b6ad 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSWebMethod.m
+++ b/sope-appserver/SoOFS/OFSWebMethod.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSWebMethod.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSWebMethod.h"
 #include "WOContext+private.h" // required for page rendering
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSWebMethodRenderer.h b/sope-appserver/SoOFS/OFSWebMethodRenderer.h
similarity index 95%
rename from sope-appserver/NGObjWeb/SoOFS/OFSWebMethodRenderer.h
rename to sope-appserver/SoOFS/OFSWebMethodRenderer.h
index c57bf84f..4808d962 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSWebMethodRenderer.h
+++ b/sope-appserver/SoOFS/OFSWebMethodRenderer.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSWebMethodRenderer.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __SoOFS_OFSWebMethodRenderer_H__
 #define __SoOFS_OFSWebMethodRenderer_H__
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSWebMethodRenderer.m b/sope-appserver/SoOFS/OFSWebMethodRenderer.m
similarity index 97%
rename from sope-appserver/NGObjWeb/SoOFS/OFSWebMethodRenderer.m
rename to sope-appserver/SoOFS/OFSWebMethodRenderer.m
index 6c5dc77a..595b829b 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSWebMethodRenderer.m
+++ b/sope-appserver/SoOFS/OFSWebMethodRenderer.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSWebMethodRenderer.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSWebMethodRenderer.h"
 #include "OFSWebMethod.h"
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSWebTemplate.h b/sope-appserver/SoOFS/OFSWebTemplate.h
similarity index 95%
rename from sope-appserver/NGObjWeb/SoOFS/OFSWebTemplate.h
rename to sope-appserver/SoOFS/OFSWebTemplate.h
index 49323306..23bfaee7 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSWebTemplate.h
+++ b/sope-appserver/SoOFS/OFSWebTemplate.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSWebTemplate.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __SoOFS_OFSWebTemplate_H__
 #define __SoOFS_OFSWebTemplate_H__
diff --git a/sope-appserver/NGObjWeb/SoOFS/OFSWebTemplate.m b/sope-appserver/SoOFS/OFSWebTemplate.m
similarity index 94%
rename from sope-appserver/NGObjWeb/SoOFS/OFSWebTemplate.m
rename to sope-appserver/SoOFS/OFSWebTemplate.m
index e2617d28..78232b4e 100644
--- a/sope-appserver/NGObjWeb/SoOFS/OFSWebTemplate.m
+++ b/sope-appserver/SoOFS/OFSWebTemplate.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: OFSWebTemplate.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSWebTemplate.h"
 #include "common.h"
diff --git a/sope-appserver/NGObjWeb/SoOFS/README b/sope-appserver/SoOFS/README
similarity index 96%
rename from sope-appserver/NGObjWeb/SoOFS/README
rename to sope-appserver/SoOFS/README
index 35f9ecbc..fdab5571 100644
--- a/sope-appserver/NGObjWeb/SoOFS/README
+++ b/sope-appserver/SoOFS/README
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: README 4 2004-08-20 17:04:31Z helge $
 
 The SOPE Object File System (OFS)
 =================================
diff --git a/sope-appserver/NGObjWeb/SoOFS/SoOFS-Info.plist b/sope-appserver/SoOFS/SoOFS-Info.plist
similarity index 100%
rename from sope-appserver/NGObjWeb/SoOFS/SoOFS-Info.plist
rename to sope-appserver/SoOFS/SoOFS-Info.plist
diff --git a/sope-appserver/NGObjWeb/SoOFS/SoOFS-SXP-Info.plist b/sope-appserver/SoOFS/SoOFS-SXP-Info.plist
similarity index 100%
rename from sope-appserver/NGObjWeb/SoOFS/SoOFS-SXP-Info.plist
rename to sope-appserver/SoOFS/SoOFS-SXP-Info.plist
diff --git a/sope-appserver/NGObjWeb/SoOFS/SoOFS.h b/sope-appserver/SoOFS/SoOFS.h
similarity index 95%
rename from sope-appserver/NGObjWeb/SoOFS/SoOFS.h
rename to sope-appserver/SoOFS/SoOFS.h
index b9d7e197..aed30dd2 100644
--- a/sope-appserver/NGObjWeb/SoOFS/SoOFS.h
+++ b/sope-appserver/SoOFS/SoOFS.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: SoOFS.h 4 2004-08-20 17:04:31Z helge $
 
 #ifndef __NGObjWeb_SoOFS_H__
 #define __NGObjWeb_SoOFS_H__
diff --git a/sope-appserver/NGObjWeb/SoOFSProduct.m b/sope-appserver/SoOFS/SoOFSProduct.m
similarity index 95%
rename from sope-appserver/NGObjWeb/SoOFSProduct.m
rename to sope-appserver/SoOFS/SoOFSProduct.m
index 1a83354f..b0e54e58 100644
--- a/sope-appserver/NGObjWeb/SoOFSProduct.m
+++ b/sope-appserver/SoOFS/SoOFSProduct.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: SoOFSProduct.m 4 2004-08-20 17:04:31Z helge $
 
 #import <Foundation/NSObject.h>
 
diff --git a/sope-appserver/NGObjWeb/SoOFS/TODO b/sope-appserver/SoOFS/TODO
similarity index 97%
rename from sope-appserver/NGObjWeb/SoOFS/TODO
rename to sope-appserver/SoOFS/TODO
index 587bd914..cbd5ae38 100644
--- a/sope-appserver/NGObjWeb/SoOFS/TODO
+++ b/sope-appserver/SoOFS/TODO
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: TODO 4 2004-08-20 17:04:31Z helge $
 
 Todo's for SOPE OFS
 
diff --git a/sope-appserver/SoOFS/Version b/sope-appserver/SoOFS/Version
new file mode 100644
index 00000000..93f90d16
--- /dev/null
+++ b/sope-appserver/SoOFS/Version
@@ -0,0 +1,3 @@
+# version file
+
+SUBMINOR_VERSION:=1
diff --git a/sope-appserver/NGObjWeb/SoOFS/common.h b/sope-appserver/SoOFS/common.h
similarity index 97%
rename from sope-appserver/NGObjWeb/SoOFS/common.h
rename to sope-appserver/SoOFS/common.h
index 854a6338..79d301e8 100644
--- a/sope-appserver/NGObjWeb/SoOFS/common.h
+++ b/sope-appserver/SoOFS/common.h
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: common.h 4 2004-08-20 17:04:31Z helge $
 
 #import <Foundation/Foundation.h>
 
diff --git a/sope-appserver/NGObjWeb/SoOFS/product.plist b/sope-appserver/SoOFS/product.plist
similarity index 97%
rename from sope-appserver/NGObjWeb/SoOFS/product.plist
rename to sope-appserver/SoOFS/product.plist
index f0237506..9d16cd09 100644
--- a/sope-appserver/NGObjWeb/SoOFS/product.plist
+++ b/sope-appserver/SoOFS/product.plist
@@ -1,5 +1,5 @@
 {
-  CVSID = "$Id$";
+  CVSID = "$Id: product.plist 4 2004-08-20 17:04:31Z helge $";
   
   requires = ( SoCore );
   
diff --git a/sope-appserver/NGObjWeb/sope.m b/sope-appserver/SoOFS/sope.m
similarity index 99%
rename from sope-appserver/NGObjWeb/sope.m
rename to sope-appserver/SoOFS/sope.m
index 1ec574e1..2fdc33f3 100644
--- a/sope-appserver/NGObjWeb/sope.m
+++ b/sope-appserver/SoOFS/sope.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: sope.m 4 2004-08-20 17:04:31Z helge $
 
 #include "SoObjects/SoApplication.h"