fix for SoProductResourceManager.m

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index ee839f8b53729c923e3c828b860f99568471ebc3..f2abfed9d9bbf3a64467577a2ad4d57c74227384 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,14 @@
+2004-09-20  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v4.3.40
+
+       * SoObjects/SoProductResourceManager.m: changed method
+         -pathForResourceNamed:inFramework:languages: to use new NGExtensions
+         addition to NSBundle for proper localized resource lookup
+
+       * NGObjWeb.xcode: added SOPE_MAJOR_VERSION and SOPE_MINOR_VERSION to
+         the build defines
+
 2004-09-14  Helge Hess  <helge.hess@skyrix.com>
 
        * WOMessage.m, WOCoreApplication.m, SoProductRegistry.m, 

diff --git a/sope-appserver/NGObjWeb/NGHttp/ChangeLog b/sope-appserver/NGObjWeb/NGHttp/ChangeLog
index 7ec853b269cce30cb420d37a4caafa5e67df1476..85a7c5a8260e5bca784d290f4c0ac043b20cf64d 100644 (file)
--- a/sope-appserver/NGObjWeb/NGHttp/ChangeLog
+++ b/sope-appserver/NGObjWeb/NGHttp/ChangeLog
@@ -1,4 +1,8 @@
-2004-06-29  Marcus Mueller  <znek@mulle-kybernetik.com>
+2004-09-20  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * NGHttp.xcode: minor changes
+
+2004-08-29  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * NGHttp.xcode: new Xcode project
 

diff --git a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj
index fb35ac6d30ed9c53cb7a8fa4829fa38010cdb507..044190b1d66b704103ae61f3ac1beb8cfe033ebf 100644 (file)
--- a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj
@@ -38,6 +38,180 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
+               AD915D3A06E29F74004720C2 = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = "wrapper.pb-project";
+                       name = EOControl.xcode;
+                       path = "../../../sope-core/EOControl/EOControl.xcode";
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD915D3E06E29F85004720C2 = {
+                       containerPortal = ADFE62AC06E25BF4006628C4;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 1;
+                       remoteGlobalIDString = ADD65D5706DA372D007161CA;
+                       remoteInfo = NGExtensions;
+               };
+               AD915D3F06E29F85004720C2 = {
+                       isa = PBXTargetDependency;
+                       name = "NGExtensions (from NGExtensions.xcode)";
+                       targetProxy = AD915D3E06E29F85004720C2;
+               };
+               AD915D4006E29F85004720C2 = {
+                       containerPortal = ADFE62A606E25B6C006628C4;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 1;
+                       remoteGlobalIDString = ADD65D5706DA372D007161CA;
+                       remoteInfo = NGMime;
+               };
+               AD915D4106E29F85004720C2 = {
+                       isa = PBXTargetDependency;
+                       name = "NGMime (from NGMime.xcode)";
+                       targetProxy = AD915D4006E29F85004720C2;
+               };
+               AD915D4206E29F90004720C2 = {
+                       children = (
+                               AD915D4306E29F90004720C2,
+                       );
+                       isa = PBXGroup;
+                       name = Products;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD915D4306E29F90004720C2 = {
+                       fileType = wrapper.framework;
+                       isa = PBXReferenceProxy;
+                       path = EOControl.framework;
+                       refType = 3;
+                       remoteRef = AD915D4906E29FC5004720C2;
+                       sourceTree = BUILT_PRODUCTS_DIR;
+               };
+               AD915D4406E29F97004720C2 = {
+                       containerPortal = AD915D3A06E29F74004720C2;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 1;
+                       remoteGlobalIDString = ADDF431E06DA4E3500C4E7F8;
+                       remoteInfo = EOControl;
+               };
+               AD915D4506E29F97004720C2 = {
+                       isa = PBXTargetDependency;
+                       name = "EOControl (from EOControl.xcode)";
+                       targetProxy = AD915D4406E29F97004720C2;
+               };
+               AD915D4806E29FA7004720C2 = {
+                       fileRef = AD915D4306E29F90004720C2;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               AD915D4906E29FC5004720C2 = {
+                       containerPortal = AD915D3A06E29F74004720C2;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 2;
+                       remoteGlobalIDString = ADDF431F06DA4E3500C4E7F8;
+                       remoteInfo = EOControl;
+               };
+               AD915D4A06E2A19F004720C2 = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = "wrapper.pb-project";
+                       name = DOM.xcode;
+                       path = "../../../sope-xml/DOM/DOM.xcode";
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD915D4C06E2A1BB004720C2 = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = "wrapper.pb-project";
+                       name = SaxObjC.xcode;
+                       path = "../../../sope-xml/SaxObjC/SaxObjC.xcode";
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD915D4E06E2A1C2004720C2 = {
+                       children = (
+                               AD915D4F06E2A1C2004720C2,
+                       );
+                       isa = PBXGroup;
+                       name = Products;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD915D4F06E2A1C2004720C2 = {
+                       fileType = wrapper.framework;
+                       isa = PBXReferenceProxy;
+                       path = SaxObjC.framework;
+                       refType = 3;
+                       remoteRef = AD915D5806E2A203004720C2;
+                       sourceTree = BUILT_PRODUCTS_DIR;
+               };
+               AD915D5006E2A1C3004720C2 = {
+                       children = (
+                               AD915D5106E2A1C3004720C2,
+                       );
+                       isa = PBXGroup;
+                       name = Products;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD915D5106E2A1C3004720C2 = {
+                       fileType = wrapper.framework;
+                       isa = PBXReferenceProxy;
+                       path = DOM.framework;
+                       refType = 3;
+                       remoteRef = AD915D5906E2A203004720C2;
+                       sourceTree = BUILT_PRODUCTS_DIR;
+               };
+               AD915D5206E2A1C6004720C2 = {
+                       fileRef = AD915D4F06E2A1C2004720C2;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               AD915D5306E2A1CA004720C2 = {
+                       fileRef = AD915D5106E2A1C3004720C2;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               AD915D5406E2A1E1004720C2 = {
+                       containerPortal = AD915D4C06E2A1BB004720C2;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 1;
+                       remoteGlobalIDString = ADDF54A806DE727A00C4E7F8;
+                       remoteInfo = SaxObjC;
+               };
+               AD915D5506E2A1E1004720C2 = {
+                       isa = PBXTargetDependency;
+                       name = "SaxObjC (from SaxObjC.xcode)";
+                       targetProxy = AD915D5406E2A1E1004720C2;
+               };
+               AD915D5606E2A1E1004720C2 = {
+                       containerPortal = AD915D4A06E2A19F004720C2;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 1;
+                       remoteGlobalIDString = AD01311E06DE794E000910D8;
+                       remoteInfo = DOM;
+               };
+               AD915D5706E2A1E1004720C2 = {
+                       isa = PBXTargetDependency;
+                       name = "DOM (from DOM.xcode)";
+                       targetProxy = AD915D5606E2A1E1004720C2;
+               };
+               AD915D5806E2A203004720C2 = {
+                       containerPortal = AD915D4C06E2A1BB004720C2;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 2;
+                       remoteGlobalIDString = ADDF54A906DE727A00C4E7F8;
+                       remoteInfo = SaxObjC;
+               };
+               AD915D5906E2A203004720C2 = {
+                       containerPortal = AD915D4A06E2A19F004720C2;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 2;
+                       remoteGlobalIDString = AD01311F06DE794E000910D8;
+                       remoteInfo = DOM;
+               };
                ADD65B6606DA32D6007161CA = {
                        children = (
                                AD013B8706E20AC5000910D8,
@@ -101,17 +275,29 @@
                        projectDirPath = "";
                        projectReferences = (
                                {
-                                       ProductGroup = ADFE62AE06E25BFB006628C4;
-                                       ProjectRef = ADFE62AC06E25BF4006628C4;
+                                       ProductGroup = AD915D4E06E2A1C2004720C2;
+                                       ProjectRef = AD915D4C06E2A1BB004720C2;
                                },
                                {
                                        ProductGroup = ADFE56F606E24C20006628C4;
                                        ProjectRef = ADFE56F406E24C1C006628C4;
                                },
+                               {
+                                       ProductGroup = ADFE62AE06E25BFB006628C4;
+                                       ProjectRef = ADFE62AC06E25BF4006628C4;
+                               },
                                {
                                        ProductGroup = ADFE62A806E25B73006628C4;
                                        ProjectRef = ADFE62A606E25B6C006628C4;
                                },
+                               {
+                                       ProductGroup = AD915D5006E2A1C3004720C2;
+                                       ProjectRef = AD915D4A06E2A19F004720C2;
+                               },
+                               {
+                                       ProductGroup = AD915D4206E29F90004720C2;
+                                       ProjectRef = AD915D3A06E29F74004720C2;
+                               },
                        );
                        targets = (
                                ADD65D5706DA372D007161CA,
@@ -244,6 +430,9 @@
                        buildActionMask = 2147483647;
                        files = (
                                ADD65F7506DA3C51007161CA,
+                               AD915D5206E2A1C6004720C2,
+                               AD915D5306E2A1CA004720C2,
+                               AD915D4806E29FA7004720C2,
                                ADFE62B006E25BFE006628C4,
                                ADFE56F806E24C22006628C4,
                                ADFE62AA06E25B75006628C4,
@@ -280,7 +469,12 @@
                                WARNING_CFLAGS = "-Wmost";
                        };
                        dependencies = (
+                               AD915D5506E2A1E1004720C2,
+                               AD915D5706E2A1E1004720C2,
+                               AD915D4506E29F97004720C2,
                                ADFE56FA06E24C3D006628C4,
+                               AD915D3F06E29F85004720C2,
+                               AD915D4106E29F85004720C2,
                        );
                        isa = PBXNativeTarget;
                        name = NGHttp;
@@ -706,6 +900,9 @@
                };
                ADFE56F306E24BF5006628C4 = {
                        children = (
+                               AD915D4C06E2A1BB004720C2,
+                               AD915D4A06E2A19F004720C2,
+                               AD915D3A06E29F74004720C2,
                                ADFE62AC06E25BF4006628C4,
                                ADFE56F406E24C1C006628C4,
                                ADFE62A606E25B6C006628C4,

diff --git a/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj b/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj
index 77d6b75692a0c36245c8ddd523c05a14e45b7c16..eff52d53340c3a41960780abaf1ddfeadc1c0972 100644 (file)
--- a/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj
@@ -675,7 +675,6 @@
                                ADFE567306E2493E006628C4,
                                ADFE567606E2493E006628C4,
                                ADFE567706E2493E006628C4,
-                               ADFE567806E2493E006628C4,
                                ADFE567906E2493E006628C4,
                                ADFE567B06E2493E006628C4,
                                ADFE567C06E2493E006628C4,
@@ -694,7 +693,6 @@
                                ADFE6F8B06E27365006628C4,
                                ADFE6F8D06E27365006628C4,
                                ADFE6F8F06E27365006628C4,
-                               ADFE736D06E28952006628C4,
                        );
                        isa = PBXSourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
@@ -739,7 +737,7 @@
                                HEADER_SEARCH_PATHS = ..;
                                INFOPLIST_FILE = "NGObjWeb-Info.plist";
                                INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-                               OTHER_CFLAGS = "";
+                               OTHER_CFLAGS = "-DSOPE_MAJOR_VERSION=4 -DSOPE_MINOR_VERSION=3";
                                OTHER_LDFLAGS = "-seg1addr 0xC4900000 -headerpad_max_install_names";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = NGObjWeb;
@@ -3546,17 +3544,6 @@
                        tabWidth = 2;
                        usesTabs = 0;
                };
-               ADFE54CA06E2493D006628C4 = {
-                       fileEncoding = 5;
-                       indentWidth = 2;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.objc;
-                       path = "WOComponent+JS.m";
-                       refType = 4;
-                       sourceTree = "<group>";
-                       tabWidth = 2;
-                       usesTabs = 0;
-               };
                ADFE54CB06E2493D006628C4 = {
                        fileEncoding = 5;
                        indentWidth = 2;
@@ -4157,17 +4144,6 @@
                        tabWidth = 2;
                        usesTabs = 0;
                };
-               ADFE550506E2493D006628C4 = {
-                       fileEncoding = 5;
-                       indentWidth = 2;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.objc;
-                       path = "WOSession+JS.m";
-                       refType = 4;
-                       sourceTree = "<group>";
-                       tabWidth = 2;
-                       usesTabs = 0;
-               };
                ADFE550606E2493D006628C4 = {
                        fileEncoding = 5;
                        indentWidth = 2;
@@ -6065,12 +6041,6 @@
                        settings = {
                        };
                };
-               ADFE567806E2493E006628C4 = {
-                       fileRef = ADFE550506E2493D006628C4;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
                ADFE567906E2493E006628C4 = {
                        fileRef = ADFE550606E2493D006628C4;
                        isa = PBXBuildFile;
@@ -6631,7 +6601,6 @@
                                GCC_WARN_UNKNOWN_PRAGMAS = NO;
                                INFOPLIST_FILE = "SoObjects/SoCore-SXP-Info.plist";
                                INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/SoProducts";
-                               OPTIMIZATION_CFLAGS = "";
                                OTHER_CFLAGS = "-I.. -DAPPLE_RUNTIME=1 -DNeXT_RUNTIME=1 -DCOCOA_Foundation_LIBRARY=1 -DCOMPILE_AS_FRAMEWORK=1 -DNeXT_Foundation_LIBRARY=1";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = SoCore;
@@ -6755,7 +6724,6 @@
                                ADFE737006E289B9006628C4,
                                ADFE54C706E2493D006628C4,
                                ADFE54C806E2493D006628C4,
-                               ADFE54CA06E2493D006628C4,
                                ADFE54CB06E2493D006628C4,
                                ADFE54CC06E2493D006628C4,
                                ADFE54C906E2493D006628C4,
@@ -6790,7 +6758,6 @@
                        children = (
                                ADFE54E106E2493D006628C4,
                                ADFE550306E2493D006628C4,
-                               ADFE550506E2493D006628C4,
                                ADFE550406E2493D006628C4,
                                ADFE550606E2493D006628C4,
                        );
@@ -7118,12 +7085,6 @@
                        remoteGlobalIDString = ADD65D5806DA372D007161CA;
                        remoteInfo = SoObjects;
                };
-               ADFE736D06E28952006628C4 = {
-                       fileRef = ADFE54CA06E2493D006628C4;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
                ADFE737006E289B9006628C4 = {
                        children = (
                                ADFE550106E2493D006628C4,

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoProductResourceManager.m b/sope-appserver/NGObjWeb/SoObjects/SoProductResourceManager.m
index 735dc3f233f02d9db2544fa58953d5665615b373..eaead66d873a2bcd34798710ec7e7c3c3d189d26 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoProductResourceManager.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoProductResourceManager.m
@@ -29,6 +29,7 @@
 #include <NGObjWeb/WOSession.h>
 #include <NGObjWeb/WORequest.h>
 #include <NGExtensions/NSString+Ext.h>
+#include <NGExtensions/NSBundle+misc.h>
 #include "common.h"
 
 @interface WOResourceManager(UsedPrivates)
@@ -109,9 +110,10 @@ static BOOL debugOn = NO;
   
   /* lookup resource in bundle */
   
-  // TODO: what about the languages?!
   path = [bundle pathForResource:[_name stringByDeletingPathExtension]
-                 ofType:[_name pathExtension]];
+                 ofType:[_name pathExtension]
+                 inDirectory:nil
+                 forLocalizations:_languages];
   if (path != nil) {
     if (debugOn) [self debugWithFormat:@"  => found: %@", path];
     return path;

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 0aff0f28bd612bdee6b612bcbbc1e150c25f00f0..51459395c1c482415442026384b9360feeeb451d 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,7 +1,8 @@
 # version file
 
-SUBMINOR_VERSION:=39
+SUBMINOR_VERSION:=40
 
+# v4.3.40  requires libNGExtensions v4.3.115
 # v4.2.413 requires libSaxObjC      v4.2.33
 # v4.2.341 requires libNGExtensions v4.2.77
 # v4.2.316 requires libEOControl    v4.2.39