fixed incompatibility of new logging framework with OGo

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

diff --git a/sope-appserver/NGObjWeb/WOComponent+JS.m b/sope-appserver/NGObjWeb/WOComponent+JS.m
index 45a4abc41fc80c86d4e492861f9a3792ee1db06b..90608e55cf8344a324da34970dd8d8e328a5ecdf 100644 (file)
--- a/sope-appserver/NGObjWeb/WOComponent+JS.m
+++ b/sope-appserver/NGObjWeb/WOComponent+JS.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 "common.h"
 #include <NGObjWeb/NGObjWeb.h>

diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog
index 78048ae7613a76d5e4de0f53302af2219a68bf0c..6344ef3027a376b868bfa4422d95b23c0f03e24a 100644 (file)
--- a/sope-core/NGExtensions/ChangeLog
+++ b/sope-core/NGExtensions/ChangeLog
@@ -1,5 +1,8 @@
 2004-11-24  Helge Hess  <helge.hess@opengroupware.org>
 
+       * FdExt.subproj/NSObject+Logs.m: fixed debug logging to be compatible
+         with existing code (v4.5.138)
+
        * NGBundleManager.m: subminor code cleanups (v4.5.137)
 
 2004-11-19  Marcus Mueller  <znek@mulle-kybernetik.com>

diff --git a/sope-core/NGExtensions/FdExt.subproj/NSObject+Logs.m b/sope-core/NGExtensions/FdExt.subproj/NSObject+Logs.m
index a64f4eeca432e3fe7f543b0c932fe519538ad1e2..00597f0a216ad92b308df37695b6f2f2c8f49674 100644 (file)
--- a/sope-core/NGExtensions/FdExt.subproj/NSObject+Logs.m
+++ b/sope-core/NGExtensions/FdExt.subproj/NSObject+Logs.m
@@ -53,6 +53,9 @@ static inline Class NSStringClass(void) {
     logger = [lm loggerForClass:[self class]];
 #else
     logger = [lm loggerForClass:[NSObject class]];
+#if 0
+    NSLog(@"%@: created logger: %@", self, logger);
+#endif
 #endif
   }
   return logger;
@@ -71,13 +74,16 @@ static inline Class NSStringClass(void) {
 
 - (void)debugWithFormat:(NSString *)_fmt arguments:(va_list)_va {
 #if DEBUG
-  NSString *msg;
+  NSString *msg, *msg2;
   
   if (![self isDebuggingEnabled]) return;
   
-  msg = [[NSStringClass() alloc] initWithFormat:_fmt arguments:_va];
-  [[self debugLogger] debugWithFormat:@"<%@>D %@", [self loggingPrefix], msg];
-  [msg release];
+  msg  = [[NSStringClass() alloc] initWithFormat:_fmt arguments:_va];
+  msg2 = [[NSStringClass() alloc] initWithFormat:
+                                   @"<%@>D %@", [self loggingPrefix], msg];
+  [[self debugLogger] logLevel:NGLogLevelDebug message:msg2];
+  [msg2 release];
+  [msg  release];
 #else
 #  warning debug is disabled, debugWithFormat wont print anything ..
 #endif

diff --git a/sope-core/NGExtensions/NGLogging.subproj/NGLoggerManager.m b/sope-core/NGExtensions/NGLogging.subproj/NGLoggerManager.m
index c51b37eb3ec668abf0892f4bccf08e83e392b7bb..05093a11fa82625d85296b7e7d278e4ef4909113 100644 (file)
--- a/sope-core/NGExtensions/NGLogging.subproj/NGLoggerManager.m
+++ b/sope-core/NGExtensions/NGLogging.subproj/NGLoggerManager.m
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2000-2004 SKYRIX Software AG
+  Copyright (C) 2004 SKYRIX Software AG
 
   This file is part of OpenGroupware.org.
 

diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version
index e8804e433fb89bdeef7446a77a36cdcdc6ece6cf..4c0618b61bff12413ec9b8633faa04b93bb2c5ad 100644 (file)
--- a/sope-core/NGExtensions/Version
+++ b/sope-core/NGExtensions/Version
@@ -1,6 +1,6 @@
 # version
 
-SUBMINOR_VERSION:=137
+SUBMINOR_VERSION:=138
 
 # v4.3.115 requires libFoundation v1.0.59
 # v4.2.72  requires libEOControl  v4.2.39