enhanced WO 4.5 compatibility, bumped framework versions

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 6a39de192a4ce4be4e221718c8106921498d6c9d..4675b661b1bdebabc3091298df1d82786a18c8fe 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-13  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * DynamicElements/_WOComplexHyperlink.m: do not generate hyperlink
+         if "disabled" evaluates true. This matches the behaviour of
+         WebObjects 4.5 and guarantees to do the right stuff in the context
+         of SOPE applications also. (v4.5.199)
+
 2005-09-07  Helge Hess  <helge.hess@skyrix.com>
 
        * Templates/WOxElemBuilder.m: added several support methods to assist

diff --git a/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m b/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
index e9cd262e3c2fd4cf2a7a820415c75f5f808318da..5da69b34efae05272837e5a86a9145a866e4d714 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
@@ -253,52 +253,58 @@ static Class NSURLClass = Nil;
 
 - (void)appendToResponse:(WOResponse *)_response inContext:(WOContext *)_ctx {
   WOComponent *sComponent = [_ctx component];
-  NSString *content;
-  NSString *targetView;
-  NSString *queryString = nil;
+  NSString    *content;
+  BOOL        doNotDisplay;
 
   if ([[_ctx request] isFromClientComponent])
     return;
   
-  content    = [self->string valueInContext:_ctx];
-  targetView = [self->target stringValueInComponent:sComponent];
-    
-  WOResponse_AddCString(_response, "<a href=\"");
-    
-  if ([self _appendHrefToResponse:_response inContext:_ctx]) {
-    queryString = [self queryStringForQueryDictionary:
-                         [self->queryDictionary valueInComponent:sComponent]
-                       andQueryParameters:self->queryParameters
-                       inContext:_ctx];
-  }
-  
-  if (self->fragmentIdentifier) {
-      [_response appendContentCharacter:'#'];
-      WOResponse_AddString(_response,
-         [self->fragmentIdentifier stringValueInComponent:sComponent]);
-  }
-  if (queryString) {
-    [_response appendContentCharacter:'?'];
-    WOResponse_AddString(_response, queryString);
-  }
-  [_response appendContentCharacter:'"'];
+  content      = [self->string valueInContext:_ctx];
+  doNotDisplay = [self->disabled boolValueInComponent:sComponent];
+
+  if (!doNotDisplay) {
+    NSString *targetView;
+    NSString *queryString = nil;
+
+    targetView = [self->target stringValueInComponent:sComponent];
     
-  if (targetView) {
-    WOResponse_AddCString(_response, " target=\"");
-    WOResponse_AddString(_response, targetView);
+    WOResponse_AddCString(_response, "<a href=\"");
+      
+    if ([self _appendHrefToResponse:_response inContext:_ctx]) {
+      queryString = [self queryStringForQueryDictionary:
+          [self->queryDictionary valueInComponent:sComponent]
+          andQueryParameters:self->queryParameters
+          inContext:_ctx];
+    }
+
+    if (self->fragmentIdentifier) {
+        [_response appendContentCharacter:'#'];
+        WOResponse_AddString(_response,
+           [self->fragmentIdentifier stringValueInComponent:sComponent]);
+    }
+    if (queryString) {
+      [_response appendContentCharacter:'?'];
+      WOResponse_AddString(_response, queryString);
+    }
     [_response appendContentCharacter:'"'];
+      
+    if (targetView) {
+      WOResponse_AddCString(_response, " target=\"");
+      WOResponse_AddString(_response, targetView);
+      [_response appendContentCharacter:'"'];
+    }
+      
+    [self appendExtraAttributesToResponse:_response inContext:_ctx];
+      
+    if (self->otherTagString) {
+      WOResponse_AddChar(_response, ' ');
+      WOResponse_AddString(_response,
+                           [self->otherTagString stringValueInComponent:
+                             [_ctx component]]);
+    }
+    [_response appendContentCharacter:'>'];
   }
-    
-  [self appendExtraAttributesToResponse:_response inContext:_ctx];
-    
-  if (self->otherTagString) {
-    WOResponse_AddChar(_response, ' ');
-    WOResponse_AddString(_response,
-                         [self->otherTagString stringValueInComponent:
-                           [_ctx component]]);
-  }
-  [_response appendContentCharacter:'>'];
-    
+
   /* content */
   [self->template appendToResponse:_response inContext:_ctx];
   if (content) [_response appendContentHTMLString:content];
@@ -307,8 +313,10 @@ static Class NSURLClass = Nil;
   if ((self->src != nil) || (self->filename != nil))
     [self _addImageToResponse:_response inContext:_ctx];
   
-  /* closing tag */
-  WOResponse_AddCString(_response, "</a>");
+  if (!doNotDisplay) {
+    /* closing tag */
+    WOResponse_AddCString(_response, "</a>");
+  }
 }
 
 /* description */

diff --git a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj
index 7d3535f82cf1f70ab5ee5a207602247a52cd1def..0f95de637b7ae601a461e82c834c82bb2da43c7e 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.195;
+                               DYLIB_CURRENT_VERSION = 4.5.199;
                                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.195;
+                               DYLIB_CURRENT_VERSION = 4.5.199;
                                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.195;
+                               DYLIB_CURRENT_VERSION = 4.5.199;
                                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.195;
+                               DYLIB_CURRENT_VERSION = 4.5.199;
                                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 e6e2c6a6c48f32a9edfde306af89a35a9dd51d0b..84ca265d0647c0f3d973a7653375dee7cb26ad29 100644 (file)
--- a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
@@ -1967,7 +1967,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.195;
+                               DYLIB_CURRENT_VERSION = 4.5.199;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1981,7 +1981,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=195",
+                                       "-DSOPE_SUBMINOR_VERSION=199",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
@@ -2486,7 +2486,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.195;
+                               DYLIB_CURRENT_VERSION = 4.5.199;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2510,7 +2510,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=195",
+                                       "-DSOPE_SUBMINOR_VERSION=199",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
@@ -2532,7 +2532,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.195;
+                               DYLIB_CURRENT_VERSION = 4.5.199;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -2557,7 +2557,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=195",
+                                       "-DSOPE_SUBMINOR_VERSION=199",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
@@ -2580,7 +2580,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.195;
+                               DYLIB_CURRENT_VERSION = 4.5.199;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2594,7 +2594,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=195",
+                                       "-DSOPE_SUBMINOR_VERSION=199",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj
index fc76acfdbcf30acba7bcebac2c9733a4674e1080..52e18a2e1bf5ffce34c785dcce63a3479a066ba8 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.195;
+                               DYLIB_CURRENT_VERSION = 4.5.199;
                                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.195;
+                               DYLIB_CURRENT_VERSION = 4.5.199;
                                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.195;
+                               DYLIB_CURRENT_VERSION = 4.5.199;
                                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.195;
+                               DYLIB_CURRENT_VERSION = 4.5.199;
                                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 e3f326776895b2cfbb157f4152ba2cba629abcec..6697266a4fddef87e2e079f34ba1aeb09ae6f615 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=198
+SUBMINOR_VERSION:=199
 
 # v4.5.122 requires libNGExtensions v4.5.153
 # v4.5.91  requires libNGExtensions v4.5.134

diff --git a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj
index 5da300eb0bf8332ee59a68668755c18d361bb99d..f2cacc12b8003ce229dee9700a0e832a8e6ade41 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.195;
+                               DYLIB_CURRENT_VERSION = 4.5.199;
                                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.195;
+                               DYLIB_CURRENT_VERSION = 4.5.199;
                                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.195;
+                               DYLIB_CURRENT_VERSION = 4.5.199;
                                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.195;
+                               DYLIB_CURRENT_VERSION = 4.5.199;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;