minor fix and a comment asking for some explanation

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 70f970dc5a6d0d21d4252f9a2b27cd0b56ea2277..f88af4762e31921b65407b26a733e4ea8333639d 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,13 @@
+2005-07-20  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v4.5.177
+
+       * WOApplication.m: workaround the problem that context during page
+         instantiation is always believed to be that of WOApplication.
+
+       * WOResourceManager.m: added comment for possible resource lookup
+         problem
+
 2005-07-19  Helge Hess  <helge.hess@opengroupware.org>
 
        * WOContext.m: properly generate multivalue query parameters (value is

diff --git a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
index 253616521d64a801fca6f6bbdb9a47ea170ebab6..fa356698d5c6512baf28a1175a999c1dc2b0a719 100644 (file)
--- a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
@@ -2091,6 +2091,10 @@
                                        ProductGroup = ADFE63E306E2656F006628C4 /* Products */;
                                        ProjectRef = ADFE63E206E2656F006628C4 /* NGHttp.xcodeproj */;
                                },
+                               {
+                                       ProductGroup = ADFE6C9806E27071006628C4 /* Products */;
+                                       ProjectRef = ADFE6C9706E27071006628C4 /* WebDAV.xcodeproj */;
+                               },
                                {
                                        ProductGroup = ADFE63E806E265AE006628C4 /* Products */;
                                        ProjectRef = ADFE63E606E265AB006628C4 /* sope-core.xcodeproj */;
@@ -2099,10 +2103,6 @@
                                        ProductGroup = ADFE736806E287E6006628C4 /* Products */;
                                        ProjectRef = ADFE736706E287E6006628C4 /* SoObjects.xcodeproj */;
                                },
-                               {
-                                       ProductGroup = ADFE6C9806E27071006628C4 /* Products */;
-                                       ProjectRef = ADFE6C9706E27071006628C4 /* WebDAV.xcodeproj */;
-                               },
                        );
                        targets = (
                                ADD65D5706DA372D007161CA /* NGObjWeb */,
@@ -2470,7 +2470,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.176;
+                               DYLIB_CURRENT_VERSION = 4.5.177;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2494,7 +2494,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=176",
+                                       "-DSOPE_SUBMINOR_VERSION=177",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
@@ -2516,7 +2516,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.176;
+                               DYLIB_CURRENT_VERSION = 4.5.177;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -2541,7 +2541,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=176",
+                                       "-DSOPE_SUBMINOR_VERSION=177",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
@@ -2564,7 +2564,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.176;
+                               DYLIB_CURRENT_VERSION = 4.5.177;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2578,7 +2578,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=176",
+                                       "-DSOPE_SUBMINOR_VERSION=177",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index a59509041adebdfcea59dbf5a3433d79a1eba456..aa8115f9708a02d11f40cc5c7a145a776ba458b8 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=176
+SUBMINOR_VERSION:=177
 
 # v4.5.122 requires libNGExtensions v4.5.153
 # v4.5.91  requires libNGExtensions v4.5.134

diff --git a/sope-appserver/NGObjWeb/WOApplication.m b/sope-appserver/NGObjWeb/WOApplication.m
index 62933fc6121af80ddf7e20082f224e1df588086e..e7201e5debd381b0edfc53c7b6caef3c07517001 100644 (file)
--- a/sope-appserver/NGObjWeb/WOApplication.m
+++ b/sope-appserver/NGObjWeb/WOApplication.m
@@ -1068,8 +1068,17 @@ nbuckets, nindices, narrays, idxsize);
   if ((rm = [[_ctx component] resourceManager]) == nil)
     rm = [self resourceManager];
   
+  /*  TODO:
+   *  the following ignores the fact that the passed context may be different
+   *  from that of WOApplication. During the course of template instantiation
+   *  WOApplication's current context gets attached to page which is definitely
+   *  wrong. We workaround this problem by using the private API of WOComponent
+   *  to explicitly set it. However all accompanied methods should be
+   *  extended to pass the correct context where needed.
+   */
   page      = [rm pageWithName:(_name != nil ? _name : @"Main")
                   languages:languages];
+  [page _setContext:_ctx];
   [page ensureAwakeInContext:_ctx];
   
   page = [page retain];

diff --git a/sope-appserver/NGObjWeb/WOResourceManager.m b/sope-appserver/NGObjWeb/WOResourceManager.m
index 6427de479b8e8ce7c9b68298cb779395379fc5cb..f6a8bc0d2c06e133a60603ec3b943e29891a79d4 100644 (file)
--- a/sope-appserver/NGObjWeb/WOResourceManager.m
+++ b/sope-appserver/NGObjWeb/WOResourceManager.m
@@ -934,6 +934,7 @@ _pathExists(WOResourceManager *self, NSFileManager *fm, NSString *path)
   
   /* lookup component path */
   
+  // TODO: Explain why _framework and _languages are NOT passed!
   [self _getComponentURL:&componentURL andName:&_name 
        forNameOrURL:_name inFramework:nil languages:nil];