changed to use GDLContentStore

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@629 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/SoObjects/Appointments/ChangeLog b/SOGo/SoObjects/Appointments/ChangeLog
index 3362f04ce1c0b6dea1afc03f70ed347e1212e0af..d721ae84e1730fabdd58567d717b09096f84b06d 100644 (file)
--- a/SOGo/SoObjects/Appointments/ChangeLog
+++ b/SOGo/SoObjects/Appointments/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-20  Helge Hess  <helge.hess@opengroupware.org>
+
+       * SOGoAppointmentFolder.m: changed to use GDLContentStore (v0.9.32)
+
 2005-03-03  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * SOGoGroupAppointmentFolder.m: fixed incorrect creation of a mutable

diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h
index 112010b6235fd13a8ead6a307e593f4b79aba1a1..7019e76164e9b5554361f7501640a710fb5b3d53 100644 (file)
--- a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h
+++ b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h
@@ -30,12 +30,12 @@
     Parent object: the SOGoUserFolder
     Child objects: SOGoAppointmentObject
     
-  The SOGoAppointmentFolder maps to an OCS folder of type 'appointment', that
+  The SOGoAppointmentFolder maps to an GCS folder of type 'appointment', that
   is, a content folder containing iCalendar files (and a proper quicktable).
 */
 
 @class NSString, NSArray, NSCalendarDate, NSException;
-@class OCSFolder;
+@class GCSFolder;
 
 @interface SOGoAppointmentFolder : SOGoFolder
 {
@@ -50,7 +50,7 @@
 /* fetching */
 
 - (NSArray *)fetchFields:(NSArray *)_fields
-  fromFolder:(OCSFolder *)_folder
+  fromFolder:(GCSFolder *)_folder
   from:(NSCalendarDate *)_startDate
   to:(NSCalendarDate *)_endDate;
 

diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
index 082378c062021918189b1957df740d0d742514df..3ccc895bc35c70a1bd57133b4edbe357a971915d 100644 (file)
--- a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -23,7 +23,7 @@
 #include <SOGo/SOGoCustomGroupFolder.h>
 #include <SOGo/SOGoAppointment.h>
 #include <SOGo/AgenorUserManager.h>
-#include <OGoContentStore/OCSFolder.h>
+#include <GDLContentStore/GCSFolder.h>
 #include <SaxObjC/SaxObjC.h>
 #include <NGiCal/NGiCal.h>
 #include <NGExtensions/NGCalendarDateRange.h>
@@ -282,7 +282,7 @@ static NSTimeZone *MET    = nil;
 }
 
 - (NSArray *)fetchFields:(NSArray *)_fields
-  fromFolder:(OCSFolder *)_folder
+  fromFolder:(GCSFolder *)_folder
   from:(NSCalendarDate *)_startDate
   to:(NSCalendarDate *)_endDate 
 {
@@ -365,7 +365,7 @@ static NSTimeZone *MET    = nil;
   from:(NSCalendarDate *)_startDate
   to:(NSCalendarDate *)_endDate 
 {
-  OCSFolder *folder;
+  GCSFolder *folder;
   
   if ((folder = [self ocsFolder]) == nil) {
     [self errorWithFormat:@"(%s): missing folder for fetch!",

diff --git a/SOGo/SoObjects/Appointments/Version b/SOGo/SoObjects/Appointments/Version
index 348bdedc04a9372e8b2e2b9172269ebe328e2242..fc52df3ad38932042269e3ac54a1440124773707 100644 (file)
--- a/SOGo/SoObjects/Appointments/Version
+++ b/SOGo/SoObjects/Appointments/Version
@@ -1,8 +1,9 @@
 # Version file
 
-SUBMINOR_VERSION:=31
+SUBMINOR_VERSION:=32
 
-# v0.9.28 requires NGiCal  v4.5.47
-# v0.9.26 requires libSOGo v0.9.30
-# v0.9.19 requires NGiCal  v4.5.36
-# v0.9.13 requires libSOGo v0.9.26
+# v0.9.32 requires libGDLContentStore v4.5.26
+# v0.9.28 requires libNGiCal          v4.5.47
+# v0.9.26 requires libSOGo            v0.9.30
+# v0.9.19 requires libNGiCal          v4.5.36
+# v0.9.13 requires libSOGo            v0.9.26

diff --git a/SOGo/SoObjects/Contacts/ChangeLog b/SOGo/SoObjects/Contacts/ChangeLog
index 2497f8459fbe74ff7e5740d9cb9389469cc0601e..4176cbc0ad7eda876679eabd1a6097e1df19c3ac 100644 (file)
--- a/SOGo/SoObjects/Contacts/ChangeLog
+++ b/SOGo/SoObjects/Contacts/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-20  Helge Hess  <helge.hess@opengroupware.org>
+
+       * SOGoContactFolder.m: changed to use GDLContentStore (v0.9.9)
+
 2005-02-24  Helge Hess  <helge.hess@opengroupware.org>
 
        * SOGoContactObject.m: fixed a MacOSX warning (v0.9.8)

diff --git a/SOGo/SoObjects/Contacts/SOGoContactFolder.h b/SOGo/SoObjects/Contacts/SOGoContactFolder.h
index 6c61e4b61f5c7d7ad62e31d5c76ca36bac1bf5f2..e68e7dab1380c2e33a4336eda269f530ae1696c6 100644 (file)
--- a/SOGo/SoObjects/Contacts/SOGoContactFolder.h
+++ b/SOGo/SoObjects/Contacts/SOGoContactFolder.h
@@ -30,12 +30,12 @@
     Parent object: the SOGoUserFolder
     Child objects: SOGoContactObject
     
-  The SOGoContactFolder maps to an OCS folder of type 'contact', that
+  The SOGoContactFolder maps to an GCS folder of type 'contact', that
   is, a content folder containing vcal?? files (and a proper quicktable).
 */
 
 @class NSString, NSArray, NSCalendarDate, NSException;
-@class OCSFolder;
+@class GCSFolder;
 
 @interface SOGoContactFolder : SOGoFolder
 {

diff --git a/SOGo/SoObjects/Contacts/SOGoContactFolder.m b/SOGo/SoObjects/Contacts/SOGoContactFolder.m
index fa20cccd8205ec87507f1f763a6943c3b0e98cb2..6a1829114df4411954d0a0a73743240a0c0bd8f8 100644 (file)
--- a/SOGo/SoObjects/Contacts/SOGoContactFolder.m
+++ b/SOGo/SoObjects/Contacts/SOGoContactFolder.m
@@ -22,7 +22,7 @@
 #include "SOGoContactFolder.h"
 #include <SOGo/SOGoCustomGroupFolder.h>
 #include <SOGo/AgenorUserManager.h>
-#include <OGoContentStore/OCSFolder.h>
+#include <GDLContentStore/GCSFolder.h>
 #include <NGiCal/NGiCal.h>
 #include "common.h"
 #include <unistd.h>

diff --git a/SOGo/SoObjects/Contacts/Version b/SOGo/SoObjects/Contacts/Version
index 7899863f7ddb971a42e358ab6a84c3301505fedb..34a952b83335ccdee4e2fdcd06ecac6e423e2f90 100644 (file)
--- a/SOGo/SoObjects/Contacts/Version
+++ b/SOGo/SoObjects/Contacts/Version
@@ -1,5 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=8
+SUBMINOR_VERSION:=9
 
-# v0.9.5 requires NGExtensions v4.5.136
+# v0.9.9 requires libGDLContentStore v4.5.26
+# v0.9.5 requires libNGExtensions    v4.5.136

diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog
index 5af97f2b60a9486c457a1d3242215fb2f5871773..fb88c3e1023970c4bf636c33cc9eda5a69b3dc28 100644 (file)
--- a/SOGo/SoObjects/SOGo/ChangeLog
+++ b/SOGo/SoObjects/SOGo/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-20  Helge Hess  <helge.hess@opengroupware.org>
+
+       * changed to use GDLContentStore (v0.9.34)
+
 2005-03-03  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * SOGoGroupFolder.m: switched logging to NGLogging (v0.9.33)

diff --git a/SOGo/SoObjects/SOGo/SOGoContentObject.h b/SOGo/SoObjects/SOGo/SOGoContentObject.h
index fac0382b07b0bbfe4089242008a70508894ce4aa..77e4ddaf04bb3e6449dec68e272914b77b788da3 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoContentObject.h
+++ b/SOGo/SoObjects/SOGo/SOGoContentObject.h
@@ -41,7 +41,7 @@
 /* folder */
 
 - (NSString *)ocsPathOfContainer;
-- (OCSFolder *)ocsFolder;
+- (GCSFolder *)ocsFolder;
 
 /* content */
 

diff --git a/SOGo/SoObjects/SOGo/SOGoContentObject.m b/SOGo/SoObjects/SOGo/SOGoContentObject.m
index 0b9189e68c4e338e5730c5b11ad80835201ee30e..0f958327de2e44fe73b08922b17538e639cbaa8a 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoContentObject.m
+++ b/SOGo/SoObjects/SOGo/SOGoContentObject.m
@@ -21,7 +21,7 @@
 
 #include "SOGoContentObject.h"
 #include "common.h"
-#include <OGoContentStore/OCSFolder.h>
+#include <GDLContentStore/GCSFolder.h>
 
 @implementation SOGoContentObject
 
@@ -49,7 +49,7 @@
     return;
   
   if (self->ocsPath)
-    [self warnWithFormat:@"OCS path is already set! '%@'", _path];
+    [self warnWithFormat:@"GCS path is already set! '%@'", _path];
   
   ASSIGNCOPY(self->ocsPath, _path);
 }
@@ -74,7 +74,7 @@
   return [[self container] ocsPath];
 }
 
-- (OCSFolder *)ocsFolder {
+- (GCSFolder *)ocsFolder {
   if (![[self container] respondsToSelector:@selector(ocsFolder)])
     return nil;
   
@@ -84,7 +84,7 @@
 /* content */
 
 - (NSString *)contentAsString {
-  OCSFolder *folder;
+  GCSFolder *folder;
 
   if (self->content != nil)
     return self->content;
@@ -100,7 +100,7 @@
 
 - (NSException *)saveContentString:(NSString *)_str {
   /* Note: "iCal multifolder saves" are implemented in the apt subclass! */
-  OCSFolder   *folder;
+  GCSFolder   *folder;
   NSException *ex;
 
   if ((folder = [self ocsFolder]) == nil) {
@@ -116,7 +116,7 @@
 
 - (NSException *)delete {
   /* Note: "iCal multifolder saves" are implemented in the apt subclass! */
-  OCSFolder   *folder;
+  GCSFolder   *folder;
   NSException *ex;
   
   if ((folder = [self ocsFolder]) == nil) {

diff --git a/SOGo/SoObjects/SOGo/SOGoFolder.h b/SOGo/SoObjects/SOGo/SOGoFolder.h
index 71059b6cfd34668838f03bd3ccf868ea9acad165..f48036e9fd13a3189c6abb12fd909cab2d472ad0 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoFolder.h
+++ b/SOGo/SoObjects/SOGo/SOGoFolder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2004 SKYRIX Software AG
+  Copyright (C) 2004-2005 SKYRIX Software AG
 
   This file is part of OpenGroupware.org.
 
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #ifndef __SOGo_SOGoFolder_H__
 #define __SOGo_SOGoFolder_H__
@@ -26,19 +25,19 @@
 #include <SOGo/SOGoObject.h>
 
 @class NSString, NSArray, NSDictionary;
-@class OCSFolder;
+@class GCSFolder;
 
 /*
   SOGoFolder
   
-  A common superclass for folders stored in OCS. Already deals with all OCS
+  A common superclass for folders stored in GCS. Already deals with all GCS
   folder specific things.
 */
 
 @interface SOGoFolder : SOGoObject
 {
   NSString  *ocsPath;
-  OCSFolder *ocsFolder;
+  GCSFolder *ocsFolder;
 }
 
 /* accessors */
@@ -46,8 +45,8 @@
 - (void)setOCSPath:(NSString *)_Path;
 - (NSString *)ocsPath;
 
-- (OCSFolder *)ocsFolderForPath:(NSString *)_path;
-- (OCSFolder *)ocsFolder;
+- (GCSFolder *)ocsFolderForPath:(NSString *)_path;
+- (GCSFolder *)ocsFolder;
 
 /* lower level fetches */
 

diff --git a/SOGo/SoObjects/SOGo/SOGoFolder.m b/SOGo/SoObjects/SOGo/SOGoFolder.m
index d3988c66a53aef479ac41e4de296dfcc8f52552a..6d10b9eb54db10cdd413282a638b311e9a966d4c 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoFolder.m
+++ b/SOGo/SoObjects/SOGo/SOGoFolder.m
@@ -21,8 +21,8 @@
 
 #include "SOGoFolder.h"
 #include "common.h"
-#include <OGoContentStore/OCSFolderManager.h>
-#include <OGoContentStore/OCSFolder.h>
+#include <GDLContentStore/GCSFolderManager.h>
+#include <GDLContentStore/GCSFolder.h>
 
 @implementation SOGoFolder
 
@@ -43,7 +43,7 @@
     return;
   
   if (self->ocsPath)
-    [self warnWithFormat:@"OCS path is already set! '%@'", _path];
+    [self warnWithFormat:@"GCS path is already set! '%@'", _path];
   
   ASSIGNCOPY(self->ocsPath, _path);
 }
@@ -51,13 +51,13 @@
   return self->ocsPath;
 }
 
-- (OCSFolderManager *)folderManager {
-  return [OCSFolderManager defaultFolderManager];
+- (GCSFolderManager *)folderManager {
+  return [GCSFolderManager defaultFolderManager];
 }
-- (OCSFolder *)ocsFolderForPath:(NSString *)_path {
+- (GCSFolder *)ocsFolderForPath:(NSString *)_path {
   return [[self folderManager] folderAtPath:_path];
 }
-- (OCSFolder *)ocsFolder {
+- (GCSFolder *)ocsFolder {
   if (self->ocsFolder != nil)
     return [self->ocsFolder isNotNull] ? self->ocsFolder : nil;
   

diff --git a/SOGo/SoObjects/SOGo/SOGoObject.h b/SOGo/SoObjects/SOGo/SOGoObject.h
index 6e5c93c119ccab88878993752bbd66c7dea2243a..f4d18b8fe7547b0d88d2af349399f0ea49b002b9 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoObject.h
+++ b/SOGo/SoObjects/SOGo/SOGoObject.h
@@ -35,7 +35,7 @@
 */
 
 @class NSString, NSArray, NSMutableString, NSException;
-@class OCSFolderManager, OCSFolder;
+@class GCSFolderManager, GCSFolder;
 @class SOGoUserFolder, SOGoGroupsFolder;
 
 @interface SOGoObject : NSObject

diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version
index b36c56a5d2449fdaf20a83b94c8e54213475bbb3..495213fae55216ea44dcf54aecdf6f8e702d004d 100644 (file)
--- a/SOGo/SoObjects/SOGo/Version
+++ b/SOGo/SoObjects/SOGo/Version
@@ -1,5 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=33
+SUBMINOR_VERSION:=34
 
+# v0.9.34 requires libGDLContentStore v4.5.26
 # v0.9.26 requires libOGoContentStore v0.9.13