fixed bundle resource lookup on MacOSX, changed resource lookup in

[sope] / sope-appserver / NGObjWeb / WOChildComponentReference.m

diff --git a/sope-appserver/NGObjWeb/WOChildComponentReference.m b/sope-appserver/NGObjWeb/WOChildComponentReference.m
index 3dadbd1e56ac798a12fbfa6d0df2204c3606d001..500e2a337e349a2acb4d54c25fb51a920de2e3a3 100644 (file)
--- a/sope-appserver/NGObjWeb/WOChildComponentReference.m
+++ b/sope-appserver/NGObjWeb/WOChildComponentReference.m
@@ -1,24 +1,23 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2005 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of SOPE.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOPE 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
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOPE is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
   License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
+  License along with SOPE; see the file COPYING.  If not, write to the
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "WOChildComponentReference.h"
 #include "WOComponent+private.h"
@@ -92,14 +91,14 @@ static Class NSDateClass = Nil;
   NSTimeInterval st = 0.0;
   
   if ((parent = [_ctx component]) == nil) {
-    [self logWithFormat:
-            @"WARNING(%s): did not find parent component of child %@",
+    [self warnWithFormat:
+            @"%s: did not find parent component of child %@",
             __PRETTY_FUNCTION__, self->childName];
     return;
   }
   if ((child = [parent childComponentWithName:self->childName]) == nil) {
-    [self logWithFormat:
-            @"WARNING: did not find child component %@ of parent %@",
+    [self warnWithFormat:
+            @"did not find child component %@ of parent %@",
             self->childName, [parent name]];
     return;
   }
@@ -129,14 +128,14 @@ static Class NSDateClass = Nil;
 
   if ((parent = [_ctx component]) == nil) {
     [[_ctx session]
-           logWithFormat:@"WARNING: did not find parent component of child %@",
+           warnWithFormat:@"did not find parent component of child %@",
              self->childName];
     return nil;
   }
   if ((child = [parent childComponentWithName:self->childName]) == nil) {
     [[_ctx session]
-           logWithFormat:
-             @"WARNING: did not find child component %@ of parent %@",
+           warnWithFormat:
+             @"did not find child component %@ of parent %@",
              self->childName, [parent name]];
     return nil;
   }
@@ -166,14 +165,14 @@ static Class NSDateClass = Nil;
   NSTimeInterval st = 0.0;
   
   if ((parent = [_ctx component]) == nil) {
-    [self logWithFormat:
-            @"WARNING(%s): did not find parent component of child %@",
+    [self warnWithFormat:
+            @"%s: did not find parent component of child %@",
             __PRETTY_FUNCTION__, self->childName];
     return;
   }
   if ((child = [parent childComponentWithName:self->childName]) == nil) {
-    [self logWithFormat:
-            @"WARNING: did not find child component %@ of parent %@",
+    [self warnWithFormat:
+            @"did not find child component %@ of parent %@",
             self->childName, [parent name]];
     [_response appendContentString:@"<pre>[missing component: "];
     [_response appendContentHTMLString:self->childName];