From d607fa669ca82708e8a207c6019e38a4130ec347 Mon Sep 17 00:00:00 2001
From: mguesdon <mguesdon@72102866-910b-0410-8b05-ffd578937521>
Date: Wed, 25 Jun 2003 15:32:51 +0000
Subject: [PATCH] * GSWeb.framework/GSWDefaultAdaptorThread.m: 		o log
 remote address * GSWeb.framework/GSWDeployedBundle.m: 		o fix in
 lockedCachedRelativePathForResourceNamed:inDirectory:forLanguage: 	
 	to really use cache * GSWeb.framework/GSWDirectAction.m: 	
 o call application -createContextForRequest: instead of directGSWContext
 creation * GSWeb.framework/GSWDynamicElement.h: 		o removed
 -definitionName and -setDefinitionName:

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@17024 72102866-910b-0410-8b05-ffd578937521
---
 GSWeb.framework/GSWDefaultAdaptorThread.m | 2 +-
 GSWeb.framework/GSWDeployedBundle.m       | 4 ++--
 GSWeb.framework/GSWDirectAction.m         | 2 +-
 GSWeb.framework/GSWDynamicElement.h       | 2 --
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/GSWeb.framework/GSWDefaultAdaptorThread.m b/GSWeb.framework/GSWDefaultAdaptorThread.m
index ce37aaf..d6a2d59 100644
--- a/GSWeb.framework/GSWDefaultAdaptorThread.m
+++ b/GSWeb.framework/GSWDefaultAdaptorThread.m
@@ -585,7 +585,7 @@ RCS_ID("$Id$")
       NSString* method=[requestLineArray objectAtIndex:0];
       NSString* url=[requestLineArray objectAtIndex:1];
       NSArray* http=[[requestLineArray objectAtIndex:2] componentsSeparatedByString:@"/"];
-      [GSWApplication statusLogWithFormat:@"Request uri=%@",url];
+      [GSWApplication statusLogWithFormat:@"RemoteAddress=%@ Request uri=%@",_remoteAddress,url];
 
       NSDebugDeepMLLog(@"info",@"method=%@",method);
       NSDebugDeepMLLog(@"info",@"url=%@",url);
diff --git a/GSWeb.framework/GSWDeployedBundle.m b/GSWeb.framework/GSWDeployedBundle.m
index bf757ef..f329668 100644
--- a/GSWeb.framework/GSWDeployedBundle.m
+++ b/GSWeb.framework/GSWDeployedBundle.m
@@ -390,7 +390,7 @@ RCS_ID("$Id$")
           //NSDebugMLLog(@"bundles",@"_path=%@",_path);
           if (path==GSNotFoundMarker)
             path=nil;
-          if (!path)
+          else if (!path)
             {
               //call again _relativePathForResourceNamed:inDirectory:forLanguage:
               NSString* completePathTest=nil;
@@ -420,7 +420,7 @@ RCS_ID("$Id$")
               else
                 [_relativePathsCache setObject:GSNotFoundMarker
                                      forKeysArray:keys];
-            };
+            }
         }
       NS_HANDLER
         {
diff --git a/GSWeb.framework/GSWDirectAction.m b/GSWeb.framework/GSWDirectAction.m
index 15464ff..3a77670 100644
--- a/GSWeb.framework/GSWDirectAction.m
+++ b/GSWeb.framework/GSWDirectAction.m
@@ -43,7 +43,7 @@ RCS_ID("$Id$")
   LOGObjectFnStart();
   if ((self=[super init]))
     {
-      _context=[GSWContext contextWithRequest:aRequest];
+      _context=[[GSWApplication application]createContextForRequest:aRequest];
       [GSWApp _setContext:_context]; //NDFN
       [self _initializeRequestSessionIDInContext:_context];
     };
diff --git a/GSWeb.framework/GSWDynamicElement.h b/GSWeb.framework/GSWDynamicElement.h
index 5de0f42..718c111 100644
--- a/GSWeb.framework/GSWDynamicElement.h
+++ b/GSWeb.framework/GSWDynamicElement.h
@@ -41,8 +41,6 @@
 -(id)initWithName:(NSString*)name
      associations:(NSDictionary*)associations
          template:(GSWElement*)template;
--(NSString*)definitionName;
--(void)setDefinitionName:(NSString*)definitionName;
 @end
 
 //====================================================================