From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Tue, 12 Oct 2004 17:25:57 +0000 (+0000)
Subject: minor fixes to sope
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb94cb13e8e0ef300f070f8a2154307b1a42a25d;p=sope

minor fixes to sope


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

diff --git a/sope-appserver/SoOFS/ChangeLog b/sope-appserver/SoOFS/ChangeLog
index 189cbc2e..1580d7a3 100644
--- a/sope-appserver/SoOFS/ChangeLog
+++ b/sope-appserver/SoOFS/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-12  Helge Hess  <helge.hess@opengroupware.org>
+
+	* sope.m: minor logging improvements (v4.3.12)
+
 2004-09-29  Helge Hess  <helge.hess@skyrix.com>
 
 	* fhs.make: install 'sope' tool in FHS sbin (v4.3.11)
diff --git a/sope-appserver/SoOFS/Version b/sope-appserver/SoOFS/Version
index d4260269..81248043 100644
--- a/sope-appserver/SoOFS/Version
+++ b/sope-appserver/SoOFS/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=11
+SUBMINOR_VERSION:=12
diff --git a/sope-appserver/SoOFS/product.plist b/sope-appserver/SoOFS/product.plist
index 9d16cd09..36501304 100644
--- a/sope-appserver/SoOFS/product.plist
+++ b/sope-appserver/SoOFS/product.plist
@@ -1,6 +1,4 @@
 {
-  CVSID = "$Id: product.plist 4 2004-08-20 17:04:31Z helge $";
-  
   requires = ( SoCore );
   
   classes = {
diff --git a/sope-appserver/SoOFS/sope.m b/sope-appserver/SoOFS/sope.m
index 2fdc33f3..0035a208 100644
--- a/sope-appserver/SoOFS/sope.m
+++ b/sope-appserver/SoOFS/sope.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: sope.m 4 2004-08-20 17:04:31Z helge $
 
 #include "SoObjects/SoApplication.h"
 
@@ -55,6 +54,8 @@ NSString *SoRootFolder = @"SoRootFolder";
 
 @implementation SOPE
 
+static BOOL debugRootObject = NO;
+
 + (void)initialize {
   /* 
      Since we are a tool, we have no bundle and need to declare security info
@@ -162,18 +163,25 @@ NSString *SoRootFolder = @"SoRootFolder";
 - (OFSFolder *)rootObjectInContext:(id)_ctx {
   OFSFactoryContext *ctx;
   OFSFolder *root;
+
+  if (debugRootObject) [self logWithFormat:@"queried root object ..."];
   
-  if ((root = [_ctx valueForKey:SoRootFolder]))
+  if ((root = [_ctx valueForKey:SoRootFolder]) != nil) {
+    if (debugRootObject) 
+      [self logWithFormat:@"  using cached root object: %@", root];
     return root;
+  }
   
   ctx = [OFSFactoryContext contextWithFileManager:[self fileManager]
 			   storagePath:[self rootPath]];
   
-  root = [[OFSFolder alloc] init];
+  root = [[[OFSFolder alloc] init] autorelease];
   [root takeStorageInfoFromContext:ctx];
   [root awakeFromFetchInContext:ctx];
   [_ctx takeValue:root forKey:SoRootFolder];
-  return [root autorelease];
+  if (debugRootObject) 
+    [self logWithFormat:@"  created new root object: %@", root];
+  return root;
 }
 
 /* security */
diff --git a/sope-appserver/samples/TestSite/.sope.plist b/sope-appserver/samples/TestSite/.sope.plist
index 7753c599..bc7ef8f9 100644
--- a/sope-appserver/samples/TestSite/.sope.plist
+++ b/sope-appserver/samples/TestSite/.sope.plist
@@ -1,4 +1,5 @@
 {
   // site local defaults
-  WODebugEnabled = YES;
+  WODebuggingEnabled = YES;
+  WOPort = 23032;
 }