fixed SOPE to work without GNUstep environment

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index dcd8d5064a8efb2a0e259d8b907841174a0dd6a6..c5412c7336c02d5e5a14a6fb749ac51b19e6367c 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,5 +1,9 @@
 2004-09-24  Helge Hess  <helge.hess@skyrix.com>
 
+       * SoObjects/SoProductRegistry.m: do not abort scanning for SOPE
+         products if GNUSTEP_PATHPREFIX_LIST is not set (to continue
+         searching in FHS locations) (v4.3.45)
+
        * SoObjects/SoSecurityManager.m: improved reason string of security
          exceptions (v4.3.44)
 

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoApplication.m b/sope-appserver/NGObjWeb/SoObjects/SoApplication.m
index c702804a2c201794a9db17178c4b5a39e183cfff..dd654cd5871599d239663dd7ffd77a0a558a50cb 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoApplication.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoApplication.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "SoApplication.h"
 #include "SoClassRegistry.h"
@@ -37,8 +36,8 @@
 static BOOL debugLookup = NO;
 
 - (BOOL)loadProducts:(id)_spec  {
-  if (_spec) {
-    // TODO: load specified products
+  if (_spec != nil) {
+    // TODO: only load specified products
     [self logWithFormat:@"load products (not implemented): %@", _spec];
     return NO;
   }
@@ -69,7 +68,7 @@ static BOOL debugLookup = NO;
     [self setDefaultRequestHandler:tmp];
     [tmp release];
     
-    /* load products */
+    /* load products (all if SoApplicationLoadProducts is not set) */
     if (![self loadProducts:[ud objectForKey:@"SoApplicationLoadProducts"]]) {
       [self logWithFormat:@"failed to load the products ..."];
       [self release];

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoClassRegistry.m b/sope-appserver/NGObjWeb/SoObjects/SoClassRegistry.m
index 96d0415536b5650b9606b4de57d92aa81ae7bb90..e6766fa1a72661e92e78674ee2e386ca1a1a8367 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoClassRegistry.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoClassRegistry.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 "SoClassRegistry.h"
 #include "SoObjCClass.h"

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m b/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m
index 9ee2a7159410999ee466441cae4b4bfe6ebb4d0b..0ca64d38a4a6f04d21da257bab0bc1f47d2e8810 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m
@@ -32,12 +32,12 @@
 static int debugOn = 0;
 
 + (void)initialize {
+  NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
   static BOOL didInit = NO;
-  if (!didInit) {
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    didInit = YES;
-    debugOn = [ud boolForKey:@"SoProductRegistryDebugEnabled"] ? 1 : 0;
-  }
+  if (didInit) return;
+  didInit = YES;
+  
+  debugOn = [ud boolForKey:@"SoProductRegistryDebugEnabled"] ? 1 : 0;
 }
 
 + (id)sharedProductRegistry {
@@ -241,11 +241,6 @@ static int debugOn = 0;
   
   pathes = [[pathes stringValue] componentsSeparatedByString:@":"];
 #endif
-
-  if ([pathes count] == 0) {
-    [self debugWithFormat:@"found no product pathes."];
-    return;
-  }
   
   [self debugWithFormat:@"scanning for products ..."];
   

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index b626b7e32dd3add0b41ffaa9755063db87e73e7d..7e7209b2536f052516ad372d8ed27029e89f8356 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=44
+SUBMINOR_VERSION:=45
 
 # v4.3.42  requires libNGExtensions v4.3.116
 # v4.3.40  requires libNGExtensions v4.3.115