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

diff --git a/SOGo/Main/sogod.m b/SOGo/Main/sogod.m
index 94bbd390c928ecf92ac2fa218bbcb3b477a903a6..a37d557ef30b95778dd9a9cec9c884c90431f94d 100644 (file)
--- a/SOGo/Main/sogod.m
+++ b/SOGo/Main/sogod.m
@@ -30,6 +30,7 @@
 
 #include "SOGoAuthenticator.h"
 #include "SOGoProductLoader.h"
+#include <SOGo/SOGoUserFolder.h>
 #include "common.h"
 
 @implementation SOGo
@@ -87,8 +88,8 @@ static unsigned int vMemSizeLimit = 0;
 }
 
 - (id)lookupUser:(NSString *)_key inContext:(id)_ctx {
-  //return [DSoUser dUserWithName:hostName port:port];
-  return nil;
+  return [[[SOGoUserFolder alloc] initWithName:_key inContainer:self]
+                          autorelease];
 }
 
 - (id)lookupName:(NSString *)_key inContext:(id)_ctx acquire:(BOOL)_flag {

diff --git a/SOGo/SoObjects/SOGo/GNUmakefile b/SOGo/SoObjects/SOGo/GNUmakefile
index bbf2df19d4fb91dffdafc2d4b09c24ca670d8ea5..de2ccd9f70a84bb4422056f0040409a97c778ea2 100644 (file)
--- a/SOGo/SoObjects/SOGo/GNUmakefile
+++ b/SOGo/SoObjects/SOGo/GNUmakefile
@@ -14,11 +14,13 @@ libSOGo_HEADER_FILES = \
        SOGoObject.h            \
        SOGoFolder.h            \
        SOGoContentObject.h     \
+       SOGoUserFolder.h        \
 
 libSOGo_OBJC_FILES = \
        SOGoObject.m            \
        SOGoFolder.m            \
        SOGoContentObject.m     \
+       SOGoUserFolder.m        \
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/library.make

diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog
index e44beab70eaf33c27c37248ad845144a9d9958bb..50aaf5911f18a01a9dd39665fe40f9c7434b32aa 100644 (file)
--- a/SOGo/UI/Common/ChangeLog
+++ b/SOGo/UI/Common/ChangeLog
@@ -5,4 +5,3 @@
        * GNUmakefile: patches for different build/runtime environment
 
        * created ChangeLog
-

diff --git a/SOGo/UI/Scheduler/GNUmakefile b/SOGo/UI/Scheduler/GNUmakefile
index 40c6391cae09a327b3a83a6f28e37b5b1a8064a3..bc431e59c20fda5181ce2f773d77cfe0a163588b 100644 (file)
--- a/SOGo/UI/Scheduler/GNUmakefile
+++ b/SOGo/UI/Scheduler/GNUmakefile
@@ -3,8 +3,8 @@
 include $(GNUSTEP_MAKEFILES)/common.make
 
 BUNDLE_NAME        = SchedulerUI
-BUNDLE_EXTENSION   = .zsp
-BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/ZideStore12
+BUNDLE_EXTENSION   = .SOGo
+BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo
 
 SchedulerUI_PRINCIPAL_CLASS = SchedulerUIProduct
 
@@ -32,33 +32,21 @@ SchedulerUI_RESOURCE_FILES += \
        UIxCalWeekOverview.wox          \
        UIxCalMonthOverview.wox         \
        UIxAppointmentView.wox          \
-       UIxAppointmentEditor.wox                \
-       UIxCalSelectTab.wox \
-       UIxCalDateLabel.wox \
-       UIxCalBackForthNavView.wox \
+       UIxAppointmentEditor.wox        \
+       UIxCalSelectTab.wox             \
+       UIxCalDateLabel.wox             \
+       UIxCalBackForthNavView.wox      \
        images/next_week.gif            \
-       images/previous_week.gif                                                \
-       images/icon_apt_chart.gif                                               \
-       images/icon_apt_overview.gif                            \
-       images/icon_apt_chart_inactive.gif              \
-       images/icon_apt_overview_inactive.gif \
-       images/icon_apt_column_view.gif                         \
-       images/icon_apt_list.gif                                                        \
-       images/icon_apt_list_inactive.gif                       \
+       images/previous_week.gif        \
+       images/icon_apt_chart.gif       \
+       images/icon_apt_overview.gif    \
+       images/icon_apt_chart_inactive.gif      \
+       images/icon_apt_overview_inactive.gif   \
+       images/icon_apt_column_view.gif         \
+       images/icon_apt_list.gif                \
+       images/icon_apt_list_inactive.gif       \
 
 
-ifeq ($(FOUNDATION_LIB),apple)
-ZIDESTORE=$(GNUSTEP_USER_ROOT)/Library/Headers/ZideStore12
-else
-ZIDESTORE=$(GNUSTEP_USER_ROOT)/Headers/ZideStore12
-endif
-
-ADDITIONAL_INCLUDE_DIRS += \
-       -I. \
-       -I.. \
-       -I$(ZIDESTORE)/Frontend -I$(ZIDESTORE)/Backend \
-       -I$(ZIDESTORE) -I$(ZIDESTORE)/Common
-
 # make
 
 -include GNUmakefile.preamble

diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
index 5d1ef100362e9ae94f6ceac133f4ac17f100318d..2287b597d0c7d39c20bcf62be62b9a20422c6e62 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
@@ -36,7 +36,7 @@
 
 @implementation NSObject (AppointmentHack)
 - (BOOL)isAppointment {
-  return [self isKindOfClass:NSClassFromString(@"SxAppointment")];
+  return [self isKindOfClass:NSClassFromString(@"SOGoAppointmentObject")];
 }
 @end
 

diff --git a/SOGo/UI/Scheduler/UIxAppointmentView.m b/SOGo/UI/Scheduler/UIxAppointmentView.m
index b05f9084135673975d46a55d87863d5b9bea0936..aadd53bee61e4f34e29d4cc508bbe35f7eae6b5b 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentView.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentView.m
@@ -2,14 +2,8 @@
 
 #include "UIxAppointmentView.h"
 #include "common.h"
-#include <Backend/SxAptManager.h>
 #include <SOGoLogic/SOGoAppointment.h>
 
-
-@interface NSObject(UsedPrivates)
-- (SxAptManager *)aptManagerInContext:(id)_ctx;
-@end
-
 @implementation UIxAppointmentView
 
 - (void)dealloc {
@@ -42,10 +36,6 @@
 /* backend */
 
 
-- (SxAptManager *)aptManager {
-  return [[self clientObject] aptManagerInContext:[self context]];
-}
-
 - (SOGoAppointment *)appointment {
     if(self->appointment == nil) {
         NSString *iCalString;

diff --git a/SOGo/UI/Scheduler/UIxCalView.h b/SOGo/UI/Scheduler/UIxCalView.h
index c9c10e6090b6b1f7bef7de176d179cea6bef6628..dca1329c994b7e8b36870760a7878e4eccc65e70 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalView.h
+++ b/SOGo/UI/Scheduler/UIxCalView.h
@@ -6,7 +6,6 @@
 #include <Common/UIxComponent.h>
 
 @class NSArray, NSCalendarDate;
-@class SxAptManager, SxAptSetIdentifier;
 
 @interface UIxCalView : UIxComponent
 {
@@ -45,9 +44,6 @@
 
 /* backend */
 
-- (SxAptManager *)aptManager;
-- (SxAptSetIdentifier *)aptSetID;
-
 /* fetching */
 
 - (NSCalendarDate *)startDate;

diff --git a/SOGo/UI/Scheduler/UIxCalView.m b/SOGo/UI/Scheduler/UIxCalView.m
index ebd925f3870351f87cbc87440bf6fa049c58f069..732181ea216b6b7c72d6b62fa15fd31fa9ad83cf 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalView.m
+++ b/SOGo/UI/Scheduler/UIxCalView.m
@@ -2,25 +2,19 @@
 
 #include "UIxCalView.h"
 #include "common.h"
-#include <Backend/SxAptManager.h>
 #include "UIxAppointmentFormatter.h"
 
-@interface NSObject(UsedPrivates)
-- (SxAptManager *)aptManagerInContext:(id)_ctx;
-@end
-
 @implementation UIxCalView
 
 - (void)dealloc {
   [self->appointment  release];
   [self->appointments release];
-  [self->currentDay release];
+  [self->currentDay   release];
   [super dealloc];
 }
 
 /* accessors */
 
-
 - (void)setAppointments:(NSArray *)_apts {
   ASSIGN(self->appointments, _apts);
 }
@@ -130,17 +124,10 @@
 
 /* backend */
 
-- (SxAptManager *)aptManager {
-  return [[self clientObject] aptManagerInContext:[self context]];
-}
-- (SxAptSetIdentifier *)aptSetID {
-  return [[self clientObject] aptSetID];
-}
-
 /* resource URLs (TODO?) */
 
 - (NSString *)resourcePath {
-  return @"/ZideStore.woa/WebServerResources/";
+  return @"/sogod.woa/WebServerResources/";
 }
 
 - (NSString *)favIconPath {
@@ -150,6 +137,7 @@
   NSString *path;
   
   // TODO: there should be reusable functionality for that!
+#warning ZideStore specific?
   path = @"ControlPanel/Products/ZideStoreUI/Resources/zidestoreui.css";
   return [[self context] urlWithRequestHandlerKey:@"so"
                         path:path
@@ -160,6 +148,7 @@
   NSString *path;
   
   // TODO: there should be reusable functionality for that!
+#warning ZideStore specific?
   path = @"ControlPanel/Products/ZideStoreUI/Resources/calendar.css";
   return [[self context] urlWithRequestHandlerKey:@"so"
                         path:path
@@ -176,8 +165,13 @@
 }
 
 - (NSArray *)fetchGIDs {
+#warning ZIDESTORE FETCH BACKEND
+#if 0
   return [[self aptManager] gidsOfAppointmentSet:[self aptSetID]
                             from:[self startDate] to:[self endDate]];
+#else
+  return nil;
+#endif
 }
 
 - (NSArray *)fetchCoreInfos {
@@ -191,9 +185,14 @@
   gids = [self fetchGIDs];
   [self logWithFormat:@"  %i GIDs ...", [gids count]];
   
+#warning ZIDESTORE FETCH BACKEND
+#if 0
   self->appointments = 
     [[[self aptManager] coreInfoOfAppointmentsWithGIDs:gids
                         inSet:[self aptSetID]] retain];
+#else
+  self->appointments = nil;
+#endif
   
   [self logWithFormat:@"fetched %i records.", [self->appointments count]];
   return self->appointments;

diff --git a/SOGo/UI/Scheduler/UIxCalWeekOverview.m b/SOGo/UI/Scheduler/UIxCalWeekOverview.m
index f2d8cafcc2380026c77fd7bc5d723b98d0abbe3e..f1d0d37764e3bb31683dbaeaaf3293ad8de66ae7 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalWeekOverview.m
+++ b/SOGo/UI/Scheduler/UIxCalWeekOverview.m
@@ -30,8 +30,6 @@
 @end
 
 #include "common.h"
-#include <Backend/SxAptManager.h>
-
 
 @implementation UIxCalWeekOverview
 

diff --git a/SOGo/UI/Scheduler/product.plist b/SOGo/UI/Scheduler/product.plist
index 680bd695cbfbdfb074b9b5c488ce0a151d1c5466..f00e9f8d2169e4aea1401f8b10cdfe0bf3018b5c 100644 (file)
--- a/SOGo/UI/Scheduler/product.plist
+++ b/SOGo/UI/Scheduler/product.plist
@@ -17,7 +17,7 @@
   };
 
   categories = {
-    SxAppointmentFolder = {
+    SOGoAppointmentFolder = {
       methods = {
         "weekoverview" = { 
           protectedBy = "View";
@@ -50,7 +50,7 @@
       };
     };
 
-    SxAppointment = {
+    SOGoAppointmentObject = {
       methods = {
         "view" = { 
           protectedBy = "View";