moved SOGoAuthenticator and SOGoUser to libSOGo

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

diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog
index a7f320e002b3a0af75ae44206c6f120c22a6a39c..62201d3169d7a277618652e802759a310f619d74 100644 (file)
--- a/SOGo/Main/ChangeLog
+++ b/SOGo/Main/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-14  Helge Hess  <helge.hess@opengroupware.org>
+
+       * moved SOGoUser and SOGoAuthenticator to libSOGo (v0.9.33)
+
 2005-07-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * SOGoUserHomePage.m: vacation message state is now properly being

diff --git a/SOGo/Main/GNUmakefile b/SOGo/Main/GNUmakefile
index 414e7f18905d3bd0d899d90bf3c590e86f9b39f8..8cbc220c7f00ab7576794e864fc3439a3f8bd39b 100644 (file)
--- a/SOGo/Main/GNUmakefile
+++ b/SOGo/Main/GNUmakefile
@@ -17,8 +17,6 @@ $(SOGOD)_OBJC_FILES += \
        sogod.m                 \
        SOGo.m                  \
        SOGoProductLoader.m     \
-       SOGoAuthenticator.m     \
-       SOGoUser.m              \
 
 # product
 

diff --git a/SOGo/Main/SOGo.m b/SOGo/Main/SOGo.m
index 59d438609c45a4da0742d6b91662aa902a62d0b1..d68e81ad311961d855fbb713687ddf338c0213a8 100644 (file)
--- a/SOGo/Main/SOGo.m
+++ b/SOGo/Main/SOGo.m
@@ -31,8 +31,8 @@
 
 @end
 
-#include "SOGoAuthenticator.h"
 #include "SOGoProductLoader.h"
+#include <SOGo/SOGoAuthenticator.h>
 #include <WEExtensions/WEResourceManager.h>
 #include <SOGo/SOGoUserFolder.h>
 #include "common.h"

diff --git a/SOGo/Main/SOGoUserHomePage.m b/SOGo/Main/SOGoUserHomePage.m
index 9d4426607c31a660afb4f32d1b51a9d2c845ae47..564fe0d2aa39511b50b0893d435e9c3d8f672beb 100644 (file)
--- a/SOGo/Main/SOGoUserHomePage.m
+++ b/SOGo/Main/SOGoUserHomePage.m
@@ -38,7 +38,7 @@
 
 #include <SOGo/AgenorUserManager.h>
 #include <SOGo/WOContext+Agenor.h>
-#include "SOGoUser.h"
+#include <SOGo/SOGoUser.h>
 #include "common.h"
 
 @implementation SOGoUserHomePage
@@ -176,6 +176,7 @@ static NSArray *internetAccessStates = nil;
 }
 
 - (BOOL)isNotAllowedToChangeInternetAccess {
+  // TODO: should be a SOGoUser method
   AgenorUserManager *um;
   WOContext         *ctx;
   NSString          *uid;
@@ -190,6 +191,7 @@ static NSArray *internetAccessStates = nil;
 }
 
 - (BOOL)isVacationMessageEnabledForInternet {
+  // TODO: should be a SOGoUser method
   AgenorUserManager *um;
   NSString          *uid;
 
@@ -199,6 +201,7 @@ static NSArray *internetAccessStates = nil;
 }
 
 - (BOOL)isVacationMessageEnabledForIntranet {
+  // TODO: should be a SOGoUser method
   AgenorUserManager *um;
   NSString          *uid;
   

diff --git a/SOGo/Main/Version b/SOGo/Main/Version
index e5b894f727ee8be889c6ae693183eec14b066636..376a1ba7e5121dbfab9b5adf40b95131e7c6602b 100644 (file)
--- a/SOGo/Main/Version
+++ b/SOGo/Main/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=32
+SUBMINOR_VERSION:=33
 
 # v0.9.32 requires libSOGo         v0.9.57
 # v0.9.24 requires libWEExtensions v4.5.67

diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog
index 2037499e782a184ea51de45736adce28cc3f34d8..e992cfe4809b121f9d1cc13ec4a2ec9789137488 100644 (file)
--- a/SOGo/SoObjects/SOGo/ChangeLog
+++ b/SOGo/SoObjects/SOGo/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-14  Helge Hess  <helge.hess@opengroupware.org>
+
+       * moved in SOGoUser and SOGoAuthenticator from Main (v0.9.58)
+
 2005-07-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * AgenorUserManager.[hm]: added accessors and cache for the

diff --git a/SOGo/SoObjects/SOGo/GNUmakefile b/SOGo/SoObjects/SOGo/GNUmakefile
index 0e7bfe733f775960f9241c71ffa93a063d8e6007..e9aeebd22ec6bf0385cb598f1d81fa506a413eba 100644 (file)
--- a/SOGo/SoObjects/SOGo/GNUmakefile
+++ b/SOGo/SoObjects/SOGo/GNUmakefile
@@ -33,6 +33,9 @@ libSOGo_HEADER_FILES = \
        NSString+iCal.h                 \
        NSObject+AptComparison.h        \
        WOContext+Agenor.h              \
+       \
+       SOGoAuthenticator.h             \
+       SOGoUser.h                      \
 
 libSOGo_OBJC_FILES = \
        SOGoObject.m                    \
@@ -50,6 +53,9 @@ libSOGo_OBJC_FILES = \
        NSObject+AptComparison.m        \
        WOContext+Agenor.m              \
        AgenorUserDefaults.m            \
+       \
+       SOGoAuthenticator.m             \
+       SOGoUser.m                      \
 
 # tools
 

diff --git a/SOGo/Main/SOGoAuthenticator.h b/SOGo/SoObjects/SOGo/SOGoAuthenticator.h
similarity index 100%
rename from SOGo/Main/SOGoAuthenticator.h
rename to SOGo/SoObjects/SOGo/SOGoAuthenticator.h

diff --git a/SOGo/Main/SOGoAuthenticator.m b/SOGo/SoObjects/SOGo/SOGoAuthenticator.m
similarity index 100%
rename from SOGo/Main/SOGoAuthenticator.m
rename to SOGo/SoObjects/SOGo/SOGoAuthenticator.m

diff --git a/SOGo/Main/SOGoUser.h b/SOGo/SoObjects/SOGo/SOGoUser.h
similarity index 100%
rename from SOGo/Main/SOGoUser.h
rename to SOGo/SoObjects/SOGo/SOGoUser.h

diff --git a/SOGo/Main/SOGoUser.m b/SOGo/SoObjects/SOGo/SOGoUser.m
similarity index 100%
rename from SOGo/Main/SOGoUser.m
rename to SOGo/SoObjects/SOGo/SOGoUser.m

diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version
index 0b3dc209e7e9954ebeed92c4e6b16220bf93a513..82e7cdefd1d827d6e258d8032a767a29fd484c7b 100644 (file)
--- a/SOGo/SoObjects/SOGo/Version
+++ b/SOGo/SoObjects/SOGo/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=57
+SUBMINOR_VERSION:=58
 
 # v0.9.50 requires libGDLContentStore v4.5.30
 # v0.9.34 requires libGDLContentStore v4.5.26