]> err.no Git - sope/commitdiff
projects / sope / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0275484)
minor improvement to WOHttpAdaptor, bumped framework revisions
authorznek <znek@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Wed, 12 Apr 2006 12:11:14 +0000 (12:11 +0000)
committerznek <znek@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Wed, 12 Apr 2006 12:11:14 +0000 (12:11 +0000)
git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1249 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

sope-appserver/NGObjWeb/ChangeLog patch | blob | history
sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj patch | blob | history
sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj patch | blob | history
sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj patch | blob | history
sope-appserver/NGObjWeb/Version patch | blob | history
sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m patch | blob | history
sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj patch | blob | history

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 24b68d852b66f11da805b348f6a16e7a223cd10b..e52fe7f25cbfd09982a39103bbea1a738831a8d2 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-12  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * WOHttpAdaptor/WOHttpAdaptor.m: shifted retrieval of WOPort default
+         from +initialize to -addressFromDefaultsOfApplication:, so apps that
+         may add adaptors on demand during runtime can do so. (v4.5.226)
+
 2006-04-01  Helge Hess  <helge.hess@opengroupware.org>
 
        * v4.5.225
diff --git a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj
index dc838a1a8f85148181c4d9d9e6654b05269a5de1..abe76bc73c2d7a065d7119642b3a246efd1e8077 100644 (file)
--- a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj
@@ -410,7 +410,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.225;
+                               DYLIB_CURRENT_VERSION = 4.5.226;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -596,7 +596,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.225;
+                               DYLIB_CURRENT_VERSION = 4.5.226;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -637,7 +637,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.225;
+                               DYLIB_CURRENT_VERSION = 4.5.226;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -680,7 +680,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.225;
+                               DYLIB_CURRENT_VERSION = 4.5.226;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
diff --git a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
index bce8a649980db808fa637c721f6056f84b65e591..667f05dbdde3a71e3a4e28c522726b734e23e261 100644 (file)
--- a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
@@ -1984,7 +1984,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.225;
+                               DYLIB_CURRENT_VERSION = 4.5.226;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1998,7 +1998,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=225",
+                                       "-DSOPE_SUBMINOR_VERSION=226",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
@@ -2506,7 +2506,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.225;
+                               DYLIB_CURRENT_VERSION = 4.5.226;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2530,7 +2530,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=225",
+                                       "-DSOPE_SUBMINOR_VERSION=226",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
@@ -2552,7 +2552,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.225;
+                               DYLIB_CURRENT_VERSION = 4.5.226;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -2577,7 +2577,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=225",
+                                       "-DSOPE_SUBMINOR_VERSION=226",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
@@ -2600,7 +2600,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.225;
+                               DYLIB_CURRENT_VERSION = 4.5.226;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2614,7 +2614,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=225",
+                                       "-DSOPE_SUBMINOR_VERSION=226",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj
index 9ec03a67d681ea93c0bab2c759c653c9aacf5e50..403d5992fbacb16e737fd7bf9be6e781f7ef2d3c 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj
@@ -305,7 +305,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.225;
+                               DYLIB_CURRENT_VERSION = 4.5.226;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -404,7 +404,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.225;
+                               DYLIB_CURRENT_VERSION = 4.5.226;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -444,7 +444,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.225;
+                               DYLIB_CURRENT_VERSION = 4.5.226;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -486,7 +486,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.225;
+                               DYLIB_CURRENT_VERSION = 4.5.226;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index f4f4d508aef70f114a54d6487d81b24478a57fb2..2d7502f0530655c95beae781ea56b99e2a66621d 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=225
+SUBMINOR_VERSION:=226
 
 # v4.5.214 requires libNGExtensions v4.5.179
 # v4.5.122 requires libNGExtensions v4.5.153
diff --git a/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m b/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m
index cabb78de09d7335ae0e4f3145a5550dc048a5132..64085784e5c916c646ffd214f35ddf7f12401c3d 100644 (file)
--- a/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m
+++ b/sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m
@@ -74,7 +74,6 @@ static NGLogger *perfLogger                  = nil;
 static BOOL     WOHttpAdaptor_LogStream      = NO;
 static BOOL     WOContactSNS                 = NO;
 static BOOL     WOCoreOnHTTPAdaptorException = NO;
-static NSString *WOPort                      = nil;
 static int      WOHttpAdaptorSendTimeout     = 10;
 static int      WOHttpAdaptorReceiveTimeout  = 10;
 static int      WOHttpAdaptorForkCount       = 0;
@@ -111,8 +110,7 @@ static BOOL     debugOn                      = NO;
 
   WOHttpAdaptor_LogStream = [ud boolForKey:@"WOHttpAdaptor_LogStream"];
 
-  // TODO: those two should be queried on demand to allow different defaults
-  WOPort       = [[ud stringForKey:@"WOPort"] copy];
+  // TODO: this should be queried on demand to allow different defaults
   WOContactSNS = [[ud objectForKey:@"WOContactSNS"] boolValue];
 
   WOCoreOnHTTPAdaptorException = 
@@ -159,20 +157,22 @@ static BOOL     debugOn                      = NO;
 }
 
 - (id<NGSocketAddress>)addressFromDefaultsOfApplication:(WOCoreApplication*)_a{
+  id                  woport;
   id<NGSocketAddress> lAddress = nil;
   const char *cstr;
   
-  if ([WOPort isEqualToString:@"auto"]) {
+  woport = [[NSUserDefaults standardUserDefaults] stringForKey:@"WOPort"];
+  if ([woport isEqualToString:@"auto"]) {
     if ((lAddress = [self autoBindAddress]) != nil)
       return lAddress;
   }
   
-  if ((cstr = [WOPort cString]) != NULL) {
+  if ((cstr = [woport cString]) != NULL) {
     if (isdigit(*cstr) && index(cstr, ':') == NULL) {
       NSNumber *p;
           
       p = [(WOCoreApplication *)[_a class] port];
-      if (p == nil) p = (id)WOPort;
+      if (p == nil) p = (id)woport;
           
       lAddress =
        [NGInternetSocketAddress wildcardAddressWithPort:[p intValue]];
@@ -181,7 +181,7 @@ static BOOL     debugOn                      = NO;
     }
   }
   
-  return NGSocketAddressFromString(WOPort);
+  return NGSocketAddressFromString(woport);
 }
 
 - (id<NGSocketAddress>)addressFromArguments:(NSDictionary *)_args {
diff --git a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj
index 99180aa46292d2aae5f4c68fb61cad4d926d47fd..c592fb67cd5cb0a1482a5055cc74a24781790096 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj
@@ -234,7 +234,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.225;
+                               DYLIB_CURRENT_VERSION = 4.5.226;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -332,7 +332,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.225;
+                               DYLIB_CURRENT_VERSION = 4.5.226;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -372,7 +372,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.225;
+                               DYLIB_CURRENT_VERSION = 4.5.226;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -414,7 +414,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.225;
+                               DYLIB_CURRENT_VERSION = 4.5.226;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
Unnamed repository; edit this file to name it for gitweb.