fixed compilation of SoOFS

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

diff --git a/sope-appserver/NGObjWeb/Defaults.plist b/sope-appserver/NGObjWeb/Defaults.plist
index ee6acfaf03219230be8fc1cb42217f13fe73ac9f..2131b0dc0f0a63fe7406200e91b12fba9b945e17 100644 (file)
--- a/sope-appserver/NGObjWeb/Defaults.plist
+++ b/sope-appserver/NGObjWeb/Defaults.plist
@@ -1,34 +1,35 @@
 {
   NGObjWeb_doc_   = "NSUserDefaults for NGObjWeb";
-  NGObjWeb_cvs_id = "$Id$";
 
   WOAdaptor                             = "WOHttpAdaptor";
   WOAdaptorLogPath                     = "";
   WOAdditionalAdaptors                  = ( );
-  WOApplicationSuffix                   = ".woa";
   WOApplicationBaseURL                  = "/WebObjects";
+  WOApplicationSuffix                   = ".woa";
   WOAutoOpenInBrowser                   = NO;
-  WOCachingEnabled                      = YES;
   WOCGIAdaptorURL                       = "http://localhost/cgi-bin/WebObjects";
+  WOCachingEnabled                      = YES;
   WOComponentExtensions                 = ( wo );
   WOComponentLoadWOOFiles               = NO;
   WOComponentRequestHandlerKey          = "wo";
   WOCompoundElementPool                 = NO;
   WOContactSNS                          = NO;
   WOCoreOnApplicationException          = NO;
+  WOCoreOnAwakeComponentInCtxDealloc    = NO;
   WOCoreOnHTTPAdaptorException          = NO;
-  WOCoreOnXmlRpcFault                   = NO;
   WOCoreOnRecursiveSubcomponents       = NO;
-  WOCoreOnAwakeComponentInCtxDealloc    = NO;
-  WODebugCursor                         = NO;
+  WOCoreOnXmlRpcFault                   = NO;
+  WODebugActions                        = NO;
   WODebugComponentAwake                        = NO;
   WODebugComponentDefinition            = NO;
   WODebugComponentLookup               = NO;
-  WODebugKeyPathAssociation             = NO;
+  WODebugCursor                         = NO;
   WODebugHttpTransaction                = NO;
+  WODebugKeyPathAssociation             = NO;
   WODebugResourceLookup                 = NO;
-  WODebugTakeValues                    = NO;
   WODebugStaticLinkProcessing           = NO;
+  WODebugTakeValues                    = NO;
+  WODebugZipResponse                    = NO;
   WODebuggingEnabled                    = YES;
   WODefaultSessionTimeOut               = 3600;
   WODefaultLanguages = ( 
@@ -43,30 +44,28 @@
     ptBR
   );
   WODescriptiveElementIDs               = NO;
-  WODebugActions                        = NO;
   WODirectActionRequestHandlerKey       = "x";
   WODontZipResponse                     = NO;
-  WODebugZipResponse                    = NO;
   WOEnableComponentsWithoutClasses      = NO;
   WOExpirationTimeInterval              = 120;
   WOFormAlwaysPassDown                  = YES;
   WOFrameworksBaseURL                   = "/WebObjects/Frameworks";
   WOGenerateMissingResourceLinks        = NO;
-  WOHttpAdaptor_LogStream               = NO;
   WOHttpAdaptorReceiveTimeout           = 120;
   WOHttpAdaptorSendTimeout              = 120;
+  WOHttpAdaptor_LogStream               = NO;
   WOHttpAllowHost                       = "localhost";
   WOHttpTransactionUseSimpleParser      = NO;
   WOIncludeCommentsInResponse           = YES;
   WOIsRedirectionEnabled                = NO;
   WOKeyPathAssociationsCacheSize        = 200;
   WOListenQueueSize                     = 5;
-  WOLogDefaultsOnStartup                = NO;
-  WOLogScriptKVC                        = NO;
-  WOLogScriptInit                       = NO;
-  WOLogScriptDealloc                    = NO;
   WOLogComponents                       = NO;
+  WOLogDefaultsOnStartup                = NO;
   WOLogPageCache                        = NO;
+  WOLogScriptDealloc                    = NO;
+  WOLogScriptInit                       = NO;
+  WOLogScriptKVC                        = NO;
   WOLogXmlRpcSelectorMapping            = NO;
   WONoProxySuffixes                     = ( );
   WONoSelectionString                   = "WONoSelectionString";
@@ -88,12 +87,12 @@
   WOResourceRequestHandlerKey           = "y";
   WORunMultithreaded                    = NO;
   WOSMTPHost                            = "mail";
+  WOSendMail                            = "/usr/lib/sendmail";
+  WOSessionStore                        = "WOServerSessionStore";
   WOSimpleHTTPParserDebugEnabled        = NO;
-  WOSimpleHTTPParserHeavyDebugEnabled   = NO;
   WOSimpleHTTPParserFileIOBoundary      = 16384;
+  WOSimpleHTTPParserHeavyDebugEnabled   = NO;
   WOSimpleHTTPParserMaxUploadSizeInKB   = 262144;
-  WOSendMail                            = "/usr/lib/sendmail";
-  WOSessionStore                        = "WOServerSessionStore";
   WOStatsStylesheetName                 = "WOStats.xsl";
   WOUseRelativeURLs                     = YES;
   WOValueAssociationsCacheSize          = 200;

diff --git a/sope-appserver/NGObjWeb/WOSession.m b/sope-appserver/NGObjWeb/WOSession.m
index d7053a0676848e9c6c4356b095875cd6d67aa6b9..61231902518cc89839e0156128b9e485778e0d7d 100644 (file)
--- a/sope-appserver/NGObjWeb/WOSession.m
+++ b/sope-appserver/NGObjWeb/WOSession.m
@@ -686,7 +686,8 @@ static Class NSDateClass = Nil;
     self->wosLanguages = [[_coder decodeObject] retain];
     self->wosSessionId = [[_coder decodeObject] copyWithZone:[self zone]];
     self->wosVariables = [[_coder decodeObject] copyWithZone:[self zone]];
-    [_coder decodeValueOfObjCType:@encode(NSTimeInterval) at:&(self->wosTimeOut)];
+    [_coder decodeValueOfObjCType:@encode(NSTimeInterval) 
+           at:&(self->wosTimeOut)];
     [_coder decodeValueOfObjCType:@encode(BOOL) at:&t];
     [self setStoresIDsInURLs:t];
     [_coder decodeValueOfObjCType:@encode(BOOL) at:&t];

diff --git a/sope-appserver/SoOFS/ChangeLog b/sope-appserver/SoOFS/ChangeLog
index aa2933a3acaad629e7602ac8ecb8805179d1223c..cd179a88d2e0f7dff20a356143358a9bcb28728d 100644 (file)
--- a/sope-appserver/SoOFS/ChangeLog
+++ b/sope-appserver/SoOFS/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
+
+       * OFSResourceManager.m: fixed include for WOComponentDefinition.h
+         (v4.3.6)
+
 2004-08-24  Helge Hess  <helge.hess@skyrix.com>
 
        * install product in Library/SoProducts-4.3/ (v4.3.5)

diff --git a/sope-appserver/SoOFS/OFSResourceManager.m b/sope-appserver/SoOFS/OFSResourceManager.m
index 560583fb0bd4a8a6f8f353a0af0b0749bcbdaf58..389eed973115025e51dac421ca254e3d6cb7d2ed 100644 (file)
--- a/sope-appserver/SoOFS/OFSResourceManager.m
+++ b/sope-appserver/SoOFS/OFSResourceManager.m
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
@@ -18,11 +18,10 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: OFSResourceManager.m 4 2004-08-20 17:04:31Z helge $
 
 #include "OFSResourceManager.h"
 #include "OFSBaseObject.h"
-#include "WOComponentDefinition.h"
+#include <NGObjWeb/WOComponentDefinition.h>
 #include "common.h"
 
 @interface WOResourceManager(UsedPrivates)

diff --git a/sope-appserver/SoOFS/Version b/sope-appserver/SoOFS/Version
index d1646130b383b0ffd643ec15ead84ab41281eb5e..f3879a621640c27bcba29e6090db83d874417a83 100644 (file)
--- a/sope-appserver/SoOFS/Version
+++ b/sope-appserver/SoOFS/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=5
+SUBMINOR_VERSION:=6

diff --git a/sope-xml/SaxObjC/SaxAttributes.m b/sope-xml/SaxObjC/SaxAttributes.m
index 0b77879fa22269d1a0e8beaca7dc2178a0c74def..1f80cc79ffd5ee538a1a7ba7c28041d4c99f29c2 100644 (file)
--- a/sope-xml/SaxObjC/SaxAttributes.m
+++ b/sope-xml/SaxObjC/SaxAttributes.m
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: SaxAttributes.m 4 2004-08-20 17:04:31Z helge $
 
 #include "SaxAttributes.h"
 #include "common.h"