add this (previously generated) file to the build.

2004-09-30  Chris Toshok  <toshok@ximian.com>

	* src/GNOME_Evolution_DataServer.server.in.in: add this
	(previously generated) file to the build.

	* src/GNOME_Evolution_DataServerLDAP.server.in.in,
	src/GNOME_Evolution_DataServerNOLDAP.server.in.in: nuke these
	files.

	* src/Makefile.am (evolution_data_server_LDADD): remove all the
	addressbook/calendar backend .la's from here.
	(SERVER_IN_FILE): always use
	GNOME_Evolution_DataServer.server.in.in here, and it's no longer
	generated from LDAP/NOLDAP.
	(EXTRA_DIST): remove
	GNOME_Evolution_DataServer{LDAP,NOLDAP}.server.in.in
	(CLEANFILES): remove GNOME_Evolution_DataServer.server.in.in.

	* src/server.c (setup_books): replace hardcoded knowledge of
	backends with a call to e_data_book_factory_register_backends.
	(setup_cals): remove explicit backend registration with a call to
	e_data_cal_factory_register_backends.
	(main): call e_data_server_module_init.

	* libedataserver/Makefile.am (INCLUDES): add extensiondir #define.
	(libedataserver_la_SOURCES): add e-data-server-module.c
	(libedataserverinclude_HEADERS): add e-data-server-module.h

	* libedataserver/e-data-server-module.[ch]: new files, manage the
	extensions.  ripped almost entirely from Dave Camp's nautilus
	module stuff.

	* configure.in (privlibdir, extensiondir): new Makefile variables.

5 files changed, 10 insertions, 141 deletions

diff --git a/src/.cvsignore b/src/.cvsignore
index 9578f3601..23f552580 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -4,6 +4,5 @@ Evolution-DataServer-common.c
 Evolution-DataServer-skels.c
 Evolution-DataServer-stubs.c
 Evolution-DataServer.h
-GNOME_Evolution_DataServer.server.in.in
 GNOME_Evolution_DataServer_1.0.server
-evolution-data-server
\ No newline at end of file
+evolution-data-server
diff --git a/src/GNOME_Evolution_DataServerNOLDAP.server.in.in b/src/GNOME_Evolution_DataServer.server.in.in
index 49378bed1..8816b23cb 100644
--- a/src/GNOME_Evolution_DataServerNOLDAP.server.in.in
+++ b/src/GNOME_Evolution_DataServer.server.in.in
@@ -11,12 +11,6 @@
 
 	<oaf_attribute name="name" type="string"
                        _value="Evolution Addressbook file backend"/>
-
-        <oaf_attribute name="addressbook:supported_protocols" type="stringv">
-		<item value="file"/>
-		<item value="vcf"/>
-		<item value="groupwise"/>
-        </oaf_attribute>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_CalFactory:@VERSION@"
@@ -30,13 +24,6 @@
 
 	<oaf_attribute name="name" type="string"
                        _value="Evolution Calendar file and webcal backend"/>
-
-        <oaf_attribute name="calendar:supported_protocols" type="stringv">
-		<item value="file"/>
-		<item value="webcal"/>
-		<item value="groupwise"/>
-		<item value="contacts"/>
-        </oaf_attribute>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_DataServer_InterfaceCheck"
diff --git a/src/GNOME_Evolution_DataServerLDAP.server.in.in b/src/GNOME_Evolution_DataServerLDAP.server.in.in
deleted file mode 100644
index 00f4c8d17..000000000
--- a/src/GNOME_Evolution_DataServerLDAP.server.in.in
+++ /dev/null
@@ -1,65 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_DataServer_BookFactory:@VERSION@"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-data-server-@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/DataServer/BookFactory:@VERSION@"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Addressbook file and LDAP backend"/>
-
-        <oaf_attribute name="addressbook:supported_protocols" type="stringv">
-		<item value="ldap"/>
-		<item value="file"/>
-		<item value="vcf"/>
-		<item value="groupwise"/>
-        </oaf_attribute>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_DataServer_CalFactory:@VERSION@"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-data-server-@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/DataServer/CalFactory:@VERSION@"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-                       _value="Evolution Calendar file and webcal backend"/>
-
-        <oaf_attribute name="calendar:supported_protocols" type="stringv">
-		<item value="file"/>
-		<item value="webcal"/>
-		<item value="groupwise"/>
-		<item value="contacts"/>
-        </oaf_attribute>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_DataServer_InterfaceCheck"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-data-server-@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ServerInterfaceCheck:@VERSION@"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_DataServer_Logging"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-data-server-@VERSION@">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ServerLogging:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/src/Makefile.am b/src/Makefile.am
index b07c5af4d..eca731e73 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,39 +49,16 @@ evolution_data_server_SOURCES = \
 	server-logging.h		\
 	server.c
 
-if ENABLE_LDAP
-LDAP_BACKEND_LIB=$(top_builddir)/addressbook/backends/ldap/libebookbackendldap.la
-else
-LDAP_BACKEND_LIB=
-endif
-
 evolution_data_server_LDADD =							\
 	$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la		\
-	$(top_builddir)/addressbook/backends/file/libebookbackendfile.la	\
-	$(top_builddir)/addressbook/backends/vcf/libebookbackendvcf.la		\
-	$(top_builddir)/addressbook/backends/groupwise/libebookbackendgroupwise.la \
-	$(LDAP_BACKEND_LIB)							\
 	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la		\
-	$(top_builddir)/calendar/backends/file/libecalbackendfile.la		\
-	$(top_builddir)/calendar/backends/groupwise/libecalbackendgroupwise.la	\
-	$(top_builddir)/calendar/backends/http/libecalbackendhttp.la		\
-	$(top_builddir)/addressbook/libebook/libebook-1.2.la			\
-	$(top_builddir)/calendar/backends/contacts/libecalbackendcontacts.la	\
-	$(LDAP_LIBS)								\
 	$(E_DATA_SERVER_LIBS)
 
 install-evolution-data-servers:
 	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution-data-server $(DESTDIR)$(libexecdir)/evolution-data-server-$(BASE_VERSION)
 
-if ENABLE_LDAP
-SERVER_IN_FILE=GNOME_Evolution_DataServerLDAP.server.in.in
-else
-SERVER_IN_FILE=GNOME_Evolution_DataServerNOLDAP.server.in.in
-endif
-
-GNOME_Evolution_DataServer.server.in.in: $(SERVER_IN_FILE) Makefile
-	cp $< $@
+SERVER_IN_FILE=GNOME_Evolution_DataServer.server.in.in
 
 server_in_files = GNOME_Evolution_DataServer.server.in.in
 server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
@@ -93,12 +70,10 @@ idl_DATA = $(IDLS)
 
 EXTRA_DIST = 						\
 	$(server_in_files)				\
-	$(idl_DATA)					\
-	GNOME_Evolution_DataServerLDAP.server.in.in	\
-	GNOME_Evolution_DataServerNOLDAP.server.in.in
+	$(idl_DATA)
 
 BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA)
-CLEANFILES = $(BUILT_SOURCES) GNOME_Evolution_DataServer.server.in.in
+CLEANFILES = $(BUILT_SOURCES)
 
 install-exec-local: install-evolution-data-servers
 
diff --git a/src/server.c b/src/server.c
index 813cfc123..bdb6fba61 100644
--- a/src/server.c
+++ b/src/server.c
@@ -42,20 +42,9 @@
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-generic-factory.h>
 
+#include <libedataserver/e-data-server-module.h>
 #include <libedata-book/e-data-book-factory.h>
-#include <backends/file/e-book-backend-file.h>
-#include <backends/vcf/e-book-backend-vcf.h>
-#ifdef HAVE_LDAP
-#include <backends/ldap/e-book-backend-ldap.h>
-#endif
-#include <backends/groupwise/e-book-backend-groupwise.h>
-
 #include <libedata-cal/e-data-cal-factory.h>
-#include <backends/file/e-cal-backend-file-events.h>
-#include <backends/file/e-cal-backend-file-todos.h>
-#include <backends/groupwise/e-cal-backend-groupwise.h>
-#include <backends/http/e-cal-backend-http.h>
-#include <backends/contacts/e-cal-backend-contacts.h>
 
 #include "server-interface-check.h"
 #include "server-logging.h"
@@ -183,19 +172,7 @@ setup_books (void)
 	if (!e_data_book_factory)
 		return FALSE;
 
-	e_data_book_factory_register_backend (
-		e_data_book_factory, "file", e_book_backend_file_new);
-
-	e_data_book_factory_register_backend (
-		e_data_book_factory, "vcf", e_book_backend_vcf_new);
-
-#ifdef HAVE_LDAP
-	e_data_book_factory_register_backend (
-		e_data_book_factory, "ldap", e_book_backend_ldap_new);
-#endif
-
-	e_data_book_factory_register_backend (
-		e_data_book_factory, "groupwise", e_book_backend_groupwise_new);
+	e_data_book_factory_register_backends (e_data_book_factory);
 
 	g_signal_connect (e_data_book_factory,
 			  "last_book_gone",
@@ -232,13 +209,7 @@ setup_cals (void)
 		return FALSE;
 	}
 
-	e_data_cal_factory_register_method (e_data_cal_factory, "file", ICAL_VEVENT_COMPONENT, E_TYPE_CAL_BACKEND_FILE_EVENTS);
-	e_data_cal_factory_register_method (e_data_cal_factory, "file", ICAL_VTODO_COMPONENT, E_TYPE_CAL_BACKEND_FILE_TODOS);
-	e_data_cal_factory_register_method (e_data_cal_factory, "groupwise", ICAL_VEVENT_COMPONENT, E_TYPE_CAL_BACKEND_GROUPWISE);
-	e_data_cal_factory_register_method (e_data_cal_factory, "groupwise", ICAL_VTODO_COMPONENT, E_TYPE_CAL_BACKEND_GROUPWISE);
-	e_data_cal_factory_register_method (e_data_cal_factory, "webcal", ICAL_VEVENT_COMPONENT, E_TYPE_CAL_BACKEND_HTTP);
-	e_data_cal_factory_register_method (e_data_cal_factory, "webcal", ICAL_VTODO_COMPONENT, E_TYPE_CAL_BACKEND_HTTP);
-	e_data_cal_factory_register_method (e_data_cal_factory, "contacts", ICAL_VEVENT_COMPONENT, E_TYPE_CAL_BACKEND_CONTACTS);
+	e_data_cal_factory_register_backends (e_data_cal_factory);
 
 	if (!e_data_cal_factory_register_storage (e_data_cal_factory, E_DATA_CAL_FACTORY_OAF_ID)) {
 		bonobo_object_unref (BONOBO_OBJECT (e_data_cal_factory));
@@ -334,7 +305,9 @@ main (int argc, char **argv)
 			  CORBA_OBJECT_NIL);
 	
 	setup_segv_handler ();
-	
+
+	e_data_server_module_init ();
+
 	if (!( (did_books = setup_books ())
 	       && (did_cals = setup_cals ())
 		    )) {