gunnar: server/kolabd/kolabd/dist_conf common, 1.53, 1.54 kolab, 1.70, 1.71

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv9617/kolabd/dist_conf

Modified Files:
	common kolab 
Log Message:
Prepare kolabd for kolab/issue1382 (resmgr accepts concurrent overlapping invitations) and kolab/issue2499 (Notification messages by the resource manager sould be localized)

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- common	10 Feb 2009 22:41:14 -0000	1.53
+++ common	6 Mar 2009 08:40:56 -0000	1.54
@@ -120,6 +120,8 @@
 	-e 's,[@]resmgr_conffile_usr[@],$(resmgr_conffile_usr),g' \
 	-e 's,[@]resmgr_tmpdir[@],$(resmgr_tmpdir),g' \
 	-e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
+	-e 's,[@]resmgr_locksdir[@],$(resmgr_locksdir),g' \
+	-e 's,[@]resmgr_localedir[@],$(resmgr_localedir),g' \
 	-e 's,[@]resmgr_logdir[@],$(resmgr_logdir),g' \
 	-e 's,[@]resmgr_scriptsdir[@],$(resmgr_scriptsdir),g' \
 	-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- kolab	10 Feb 2009 22:41:14 -0000	1.70
+++ kolab	6 Mar 2009 08:40:56 -0000	1.71
@@ -168,6 +168,8 @@
 resmgr_conffile_usr=${kolab_musr}
 resmgr_conffile_grp=${kolab_grp}
 resmgr_tmpdir=${localstatedir}/kolab-filter/tmp
+resmgr_locksdir=${localstatedir}/kolab-filter/locks
+resmgr_localedir=${libdir}/php/data/Kolab_Filter/locale
 resmgr_scriptsdir=${bindir}
 # @l_musr@
 resmgr_usr=${kolab_musr}