merge of '833eb53a6f748d1f0f16e7ff1f05e9c33fe3bad2'

and '9e49c487691fa9cd289dc4f2323bbb118705dfc4'

Monotone-Parent: 833eb53a6f748d1f0f16e7ff1f05e9c33fe3bad2
Monotone-Parent: 9e49c487691fa9cd289dc4f2323bbb118705dfc4
Monotone-Revision: baae213f1298842f132a9ed6584f30ec04446e62

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-04-02T18:44:55
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2009-04-02 18:44:55 +00:00
commit b5939c2c8d
3 changed files with 15 additions and 23 deletions

View file

@ -2,7 +2,13 @@
* Dropped worthless tools
* Fixed tons of compiler warnings
* SoObjects/Contacts/SOGoContactLDAPFolder.m
([SOGoContactLDAPFolder appendObject:withBaseURL:
toREPORTResponse:]): We now check if we've got
an exception when looking up contacts and the LDAP-part
of SOGo is misconfigured and warn the admin (by adding
a log entry) about it.
2009-03-31 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Scheduler/UIxCalListingActions.m ([UIxCalListingActions

View file

@ -1,6 +1,6 @@
/* SOGoContactLDAPFolder.m - this file is part of SOGo
*
* Copyright (C) 2006-2008 Inverse inc.
* Copyright (C) 2006-2009 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
@ -35,6 +35,7 @@
#import <NGObjWeb/SoSelectorInvocation.h>
#import <NGObjWeb/SoUser.h>
#import <NGExtensions/NSString+misc.h>
#import <NGExtensions/NSObject+Logs.h>
#import <EOControl/EOSortOrdering.h>
#import <SaxObjC/XMLNamespaces.h>
@ -61,6 +62,12 @@
{
component = [self lookupName: name inContext: context acquire: NO];
if ([component isKindOfClass: [NSException class]])
{
[self logWithFormat: @"Object with name '%@' not found. You likely have a LDAP configuration issue.", name];
return;
}
[r appendContentString: @" <D:response>\r\n"];
[r appendContentString: @" <D:href>"];
[r appendContentString: baseURL];

View file

@ -59,19 +59,6 @@ This package contains the header files for SOPE's GDLContentStore library.
SOPE is a framework for developing web applications and services. The
name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
%package -n sope%{sope_major_version}%{sope_minor_version}-gdl1-tools
Summary: Tools (gcs_cat/gcs_gensql/gcs_ls/gcs_mkdir/gcs_recreatequick)
Group: Development/Libraries/Objective C
Requires: sope%{sope_major_version}%{sope_minor_version}-gdl1
AutoReqProv: off
%description -n sope%{sope_major_version}%{sope_minor_version}-gdl1-tools
Various tools around the GDLContentStore.
SOPE is a framework for developing web applications and services. The
name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
%package -n sope%{sope_major_version}%{sope_minor_version}-cards
Summary: SOPE versit parsing library for iCal and VCard formats
Group: Development/Libraries/Objective C
@ -193,14 +180,6 @@ rm -fr ${RPM_BUILD_ROOT}
%{prefix}/Library/Headers/GDLContentStore
%{prefix}/Library/Libraries/libGDLContentStore*.so
%files -n sope%{sope_major_version}%{sope_minor_version}-gdl1-tools
%defattr(-,root,root,-)
%{prefix}/Tools/gcs_cat
%{prefix}/Tools/gcs_gensql
%{prefix}/Tools/gcs_ls
%{prefix}/Tools/gcs_mkdir
%{prefix}/Tools/gcs_recreatequick
%files -n sope%{sope_major_version}%{sope_minor_version}-cards
%{prefix}/Library/Libraries/libNGCards.so.*
%{prefix}/Library/SaxDrivers-%{sope_major_version}.%{sope_minor_version}/*.sax