MacOSX and logging fixes

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 55851f4ebdcbb4bf0dbf6740a15c7e86b9e11a78..29d273168f14acdd8f268e157754d0d1674fda8a 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,7 +1,12 @@
+2004-11-13  Helge Hess  <helge@groove.local>
+
+       * WOApplication.m, WOCoreApplication.m: do not use deprecated logger
+         API (v4.5.85)
+
 2004-11-12  Marcus Mueller  <znek@mulle-kybernetik.com>
 
-       * WO{Core}Application*: use new (experimental) NGLogging API from
-         NGExtensions. (v4.5.84)
+       * WOApplication.m, WOCoreApplication.m: use new NGLogging API from
+         NGExtensions (v4.5.84)
 
 2004-11-07  Marcus Mueller  <znek@mulle-kybernetik.com>
 

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 45a8697205a32d36edc2eded204aa251f4124e7b..6049a6b8e007ca5f943d22d058272a4a8c84ec1b 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=84
+SUBMINOR_VERSION:=85
 
 # v4.5.84  required libNGExtensions v4.5.127
 # v4.3.42  requires libNGExtensions v4.3.116

diff --git a/sope-appserver/NGObjWeb/WOApplication.m b/sope-appserver/NGObjWeb/WOApplication.m
index fd203daca4125edfb4a89496be54e803d6f3245d..8677483494a5c675d218b8bf5f886acb98600174 100644 (file)
--- a/sope-appserver/NGObjWeb/WOApplication.m
+++ b/sope-appserver/NGObjWeb/WOApplication.m
@@ -87,7 +87,7 @@ static NSString *rapidTurnAroundPath = nil;
 
   pool = [[NSAutoreleasePool alloc] init];
   debugOn = [WOApplication isDebuggingEnabled];
-  if(!debugOn)
+  if (!debugOn)
     [[self logger] setLogLevel:NGLogLevelInfo];
 
   if (classLock == nil) classLock = [[NSRecursiveLock alloc] init];
@@ -105,7 +105,7 @@ static NSString *rapidTurnAroundPath = nil;
 
   rapidTurnAroundPath   = [[ud stringForKey:@"WOProjectDirectory"] copy];
 
-  lm         = [NGLoggerManager defaultManager];
+  lm         = [NGLoggerManager defaultLoggerManager];
   perfLogger = [lm loggerForDefaultKey:@"WOProfileApplication"];
 
   [pool release];

diff --git a/sope-appserver/NGObjWeb/WOCoreApplication.m b/sope-appserver/NGObjWeb/WOCoreApplication.m
index 06a2846fba0f3c01c1d214a3fa324802b859ab31..dd0888a9b71187d79bf16a0e4e1a517d8b15f2de 100644 (file)
--- a/sope-appserver/NGObjWeb/WOCoreApplication.m
+++ b/sope-appserver/NGObjWeb/WOCoreApplication.m
@@ -125,7 +125,7 @@ static NSMutableArray *activeApps = nil; // THREAD
   didInit = YES;
   [self _initDefaults];
 
-  lm         = [NGLoggerManager defaultManager];
+  lm         = [NGLoggerManager defaultLoggerManager];
   perfLogger = [lm loggerForDefaultKey:@"WOProfileApplication"];
 
   ud               = [NSUserDefaults standardUserDefaults];

diff --git a/sope-core/NGExtensions/COPYRIGHT b/sope-core/NGExtensions/COPYRIGHT
index c928419b63a9c947d6ce978d22edf6e20403f68f..8e76449753144fc35cb30c8b6e3dffc6aaf60486 100644 (file)
--- a/sope-core/NGExtensions/COPYRIGHT
+++ b/sope-core/NGExtensions/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright (C) 2000-2003 SKYRIX Software AG
+Copyright (C) 2000-2004 SKYRIX Software AG
 
 
 Contact: info@skyrix.com

diff --git a/sope-core/NGExtensions/NGLogging.subproj/NGLogAppender.m b/sope-core/NGExtensions/NGLogging.subproj/NGLogAppender.m
index 38e5adb3e19b86e27cf7598581b36a187a5862c9..75c41603401bc8e502aa555577c1da4b4e4ae9f9 100644 (file)
--- a/sope-core/NGExtensions/NGLogging.subproj/NGLogAppender.m
+++ b/sope-core/NGExtensions/NGLogging.subproj/NGLogAppender.m
@@ -22,11 +22,17 @@
 #include "NGLogAppender.h"
 #include "NSObject+ExtendedLogging.h"
 #include "NGLogEvent.h"
+#include "common.h"
 
 @implementation NGLogAppender
 
 - (void)appendLogEvent:(NGLogEvent *)_event {
+#if LIB_FOUNDATION_LIBRARY
   [self subclassResponsibility:_cmd];
+#else
+  NSLog(@"ERROR(%s): method should be implemented by subclass!",
+       __PRETTY_FUNCTION__);
+#endif
 }
 
 - (NSString *)formattedEvent:(NGLogEvent *)_event {

diff --git a/sope-core/NGExtensions/NGLogging.subproj/NGLogSyslogAppender.m b/sope-core/NGExtensions/NGLogging.subproj/NGLogSyslogAppender.m
index 430dadab79d6a52cf68be17637c83def832c622b..1bb3be11c657d0965d46a776bb880565ac33c681 100644 (file)
--- a/sope-core/NGExtensions/NGLogging.subproj/NGLogSyslogAppender.m
+++ b/sope-core/NGExtensions/NGLogging.subproj/NGLogSyslogAppender.m
@@ -23,6 +23,7 @@
 #include "NGLogEvent.h"
 #include <syslog.h>
 #include <stdarg.h>
+#include "common.h"
 
 @interface NGLogSyslogAppender (PrivateAPI)
 - (int)syslogLevelForLogLevel:(NGLogLevel)_level;

diff --git a/sope-xml/SaxObjC/SaxXMLReaderFactory.m b/sope-xml/SaxObjC/SaxXMLReaderFactory.m
index f3d2ea975a67ee427bf5883f07cfcf17527b9b64..32b31ad55e3b46d3060164f0c303220207e1723f 100644 (file)
--- a/sope-xml/SaxObjC/SaxXMLReaderFactory.m
+++ b/sope-xml/SaxObjC/SaxXMLReaderFactory.m
@@ -115,7 +115,7 @@ static id      factory       = nil;
   NSString *subdir;
   id tmp;
   
-#if !COCOA_Foundation_LIBRARY
+#if !COCOA_Foundation_LIBRARY && !NeXT_Foundation_LIBRARY
   tmp = NSStandardLibraryPaths();
 #else
   tmp = nil; /* not available on Cocoa? */
@@ -170,6 +170,7 @@ static id      factory       = nil;
   ma = [NSMutableArray arrayWithCapacity:8];
   
 #if COCOA_Foundation_LIBRARY
+  /* Note: do not use NeXT_Foundation_LIBRARY, this is only for Xcode! */
   [self addSearchPathesForCocoa:ma];
 #elif GNUSTEP_BASE_LIBRARY
   [self addSearchPathesForStdLibPathes:ma];