GNOME.org
 

[monkey-bubble: 514/753] add.

commit 7c606d53eb44fd3ae2857538e94fa31c8e46a345
Author: Michael Meeks <michael ximian com>
Date:   Mon Jul 9 16:10:46 2001 +0000

    add.
    
    2001-07-09  Michael Meeks  <michael ximian com>
    
    	* tests: add.
    
    	* tests/Makefile.am: add.
    
    	* tests/test-storage.c: add.
    
    2001-07-09  Michael Meeks  <michael ximian com>
    
    	* gnome-moniker-std.[ch]: add.
    
    	* bonobo-moniker-extender-file.c: add.
    
    	* bonobo-moniker-file.c: add.
    
    	* Makefile.am (INCLUDES): re-vamp, add file monikers.

 ChangeLog                               |    8 +++
 Makefile.am                             |    2 +-
 configure.in                            |    2 +
 monikers/ChangeLog                      |   10 +++
 monikers/GNOME_Moniker_std.oaf.in.in    |   93 +++----------------------------
 monikers/bonobo-moniker-extender-file.c |    2 +-
 monikers/bonobo-moniker-file.c          |    2 +-
 monikers/gnome-moniker-std.c            |   41 +-------------
 monikers/gnome-moniker-std.h            |   40 +------------
 tests/Makefile.am                       |   41 ++-----------
 10 files changed, 45 insertions(+), 196 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b2725ff..38be793 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-09  Michael Meeks  <michael ximian com>
+
+	* tests: add.
+
+	* tests/Makefile.am: add.
+
+	* tests/test-storage.c: add.
+
 2001-07-08  Seth Nickell  <snickell stanford edu>
 
 	* libgnome/libgnome-init.c: (gnome_oaf_pre_args_parse):
diff --git a/Makefile.am b/Makefile.am
index 0a1e9da..c183fbb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = tools idl libgnome monikers po intl doc
+SUBDIRS = tools idl libgnome monikers tests po intl doc
 
 EXTRA_SUBDIRS = monikers
 
diff --git a/configure.in b/configure.in
index 09fbe31..7e8256c 100644
--- a/configure.in
+++ b/configure.in
@@ -87,9 +87,11 @@ intl/Makefile
 tools/Makefile
 tools/gnome-maketypes.awk
 idl/Makefile
+tests/Makefile
 libgnome/Makefile
 libgnome/libgnome-2.0.pc
 monikers/Makefile
+storage-modules/Makefile
 doc/Makefile
 ],[case "$CONFIG_FILES" in
 *tools/gnome-maketypes.awk*)chmod +x tools/gnome-maketypes.awk;;
diff --git a/monikers/ChangeLog b/monikers/ChangeLog
index 15b2546..b4a157f 100644
--- a/monikers/ChangeLog
+++ b/monikers/ChangeLog
@@ -1,3 +1,13 @@
+2001-07-09  Michael Meeks  <michael ximian com>
+
+	* gnome-moniker-std.[ch]: add.
+
+	* bonobo-moniker-extender-file.c: add.
+
+	* bonobo-moniker-file.c: add.
+
+	* Makefile.am (INCLUDES): re-vamp, add file monikers.
+
 2001-07-07  Martin Baulig  <baulig suse de>
 
 	* bonobo-config-ditem-utils.c: Finish ORBit2 port.
diff --git a/monikers/GNOME_Moniker_std.oaf.in.in b/monikers/GNOME_Moniker_std.oaf.in.in
index a895f9a..33eb256 100644
--- a/monikers/GNOME_Moniker_std.oaf.in.in
+++ b/monikers/GNOME_Moniker_std.oaf.in.in
@@ -1,88 +1,16 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:Bonobo_Moniker_std_Factory"
+<oaf_server iid="OAFIID:GNOME_Moniker_std_Factory"
 	type="shlib" location="@MONIKER_LIBDIR@/libmoniker_std.so">
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
+		<item value="IDL:Bonobo/GenericFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="name" type="string" _value="Standard Moniker factory"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:Bonobo_Moniker_File" type="factory"
-	location="OAFIID:Bonobo_Moniker_std_Factory">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Moniker:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" _value="generic file moniker"/>
-	<oaf_attribute name="bonobo:moniker" type="stringv">
-		<item value="file:"/>
-	</oaf_attribute>
-</oaf_server>
-
-<oaf_server iid="OAFIID:Bonobo_Moniker_Item" type="factory"
-	location="OAFIID:Bonobo_Moniker_std_Factory">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Moniker:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" _value="generic item moniker"/>
-	<oaf_attribute name="bonobo:moniker" type="stringv">
-		<item value="!"/>
-	</oaf_attribute>
-</oaf_server>
-
-<oaf_server iid="OAFIID:Bonobo_Moniker_Cache" type="factory"
-	location="OAFIID:Bonobo_Moniker_std_Factory">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Moniker:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" _value="HTTP Moniker"/>
-	<oaf_attribute name="bonobo:moniker" type="stringv">
-		<item value="cache:"/>
-	</oaf_attribute>
-</oaf_server>
-
-<oaf_server iid="OAFIID:Bonobo_Moniker_Oaf" type="factory"
-	location="OAFIID:Bonobo_Moniker_std_Factory">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Moniker:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" _value="generic Oaf activation moniker"/>
-	<oaf_attribute name="bonobo:moniker" type="stringv">
-		<item value="oafiid:"/>
-	</oaf_attribute>
-</oaf_server>
-
-<oaf_server iid="OAFIID:Bonobo_Moniker_Query" type="factory"
-	location="OAFIID:Bonobo_Moniker_std_Factory">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Moniker:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" _value="generic Oaf query moniker"/>
-	<oaf_attribute name="bonobo:moniker" type="stringv">
-		<item value="query:"/>
-	</oaf_attribute>
-</oaf_server>
-
-<oaf_server iid="OAFIID:Bonobo_Moniker_New" type="factory"
-	location="OAFIID:Bonobo_Moniker_std_Factory">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Moniker:1.0"/>
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" _value="generic factory 'new' moniker"/>
-	<oaf_attribute name="bonobo:moniker" type="stringv">
-		<item value="new:"/>
-	</oaf_attribute>
-</oaf_server>
-
-<oaf_server iid="OAFIID:Bonobo_MonikerExtender_file" type="factory"
-	location="OAFIID:Bonobo_Moniker_std_Factory">
+<oaf_server iid="OAFIID:GNOME_MonikerExtender_file" type="factory"
+	location="OAFIID:GNOME_Moniker_std_Factory">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/MonikerExtender:1.0"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
@@ -93,19 +21,16 @@
 	<oaf_attribute name="name" type="string" _value="file MonikerExtender"/>
 </oaf_server>
 
-<oaf_server iid="OAFIID:Bonobo_MonikerExtender_stream" type="factory"
-	location="OAFIID:Bonobo_Moniker_std_Factory">
+<oaf_server iid="OAFIID:GNOME_Moniker_File" type="factory"
+	location="OAFIID:GNOME_Moniker_std_Factory">
 	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/MonikerExtender:1.0"/>
+		<item value="IDL:Bonobo/Moniker:1.0"/>
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 	</oaf_attribute>
-	<oaf_attribute name="bonobo:moniker_extender" type="stringv">
+	<oaf_attribute name="name" type="string" _value="generic file moniker"/>
+	<oaf_attribute name="bonobo:moniker" type="stringv">
 		<item value="file:"/>
-		<item value="http:"/>
-		<item value="gunzip:"/>
-		<item value="untar:"/>
 	</oaf_attribute>
-	<oaf_attribute name="name" type="string" _value="stream MonikerExtender"/>
 </oaf_server>
 
 </oaf_info>
diff --git a/monikers/bonobo-moniker-extender-file.c b/monikers/bonobo-moniker-extender-file.c
index 490efc7..0ee23f9 100644
--- a/monikers/bonobo-moniker-extender-file.c
+++ b/monikers/bonobo-moniker-extender-file.c
@@ -16,7 +16,7 @@
 /* #include <libgnome/gnome-mime.h> */
 #include <liboaf/liboaf.h>
 
-#include "bonobo-moniker-std.h"
+#include "gnome-moniker-std.h"
 
 Bonobo_Unknown
 bonobo_file_extender_resolve (BonoboMonikerExtender *extender,
diff --git a/monikers/bonobo-moniker-file.c b/monikers/bonobo-moniker-file.c
index 724286a..cc34055 100644
--- a/monikers/bonobo-moniker-file.c
+++ b/monikers/bonobo-moniker-file.c
@@ -14,7 +14,7 @@
 #include <bonobo/bonobo-storage.h>
 #include <bonobo/bonobo-moniker-util.h>
 
-#include "bonobo-moniker-std.h"
+#include "gnome-moniker-std.h"
 
 Bonobo_Unknown
 bonobo_moniker_file_resolve (BonoboMoniker               *moniker,
diff --git a/monikers/gnome-moniker-std.c b/monikers/gnome-moniker-std.c
index efd7e26..0503b24 100644
--- a/monikers/gnome-moniker-std.c
+++ b/monikers/gnome-moniker-std.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include <bonobo/bonobo-shlib-factory.h>
-#include "bonobo-moniker-std.h"
+#include "gnome-moniker-std.h"
 
 static BonoboObject *
 bonobo_std_moniker_factory (BonoboGenericFactory *this,
@@ -11,51 +11,16 @@ bonobo_std_moniker_factory (BonoboGenericFactory *this,
 {
 	g_return_val_if_fail (object_id != NULL, NULL);
 
-	if (!strcmp (object_id, "OAFIID:Bonobo_Moniker_File"))
+	if (!strcmp (object_id, "OAFIID:GNOME_Moniker_File"))
 
 		return BONOBO_OBJECT (bonobo_moniker_simple_new (
 			"file:", bonobo_moniker_file_resolve));
 
-	else if (!strcmp (object_id, "OAFIID:Bonobo_Moniker_Item"))
-
-		return BONOBO_OBJECT (bonobo_moniker_simple_new (
-			"!", bonobo_moniker_item_resolve));
-	
-	else if (!strcmp (object_id, "OAFIID:Bonobo_Moniker_Oaf"))
-
-		return BONOBO_OBJECT (bonobo_moniker_simple_new (
-			"oafiid:", bonobo_moniker_oaf_resolve));
-
-	else if (!strcmp (object_id, "OAFIID:Bonobo_Moniker_Cache"))
-
-		return BONOBO_OBJECT (bonobo_moniker_simple_new (
-			"cache:", bonobo_moniker_cache_resolve));
-
-	else if (!strcmp (object_id, "OAFIID:Bonobo_Moniker_New"))
-
-		return BONOBO_OBJECT (bonobo_moniker_simple_new (
-			"new:", bonobo_moniker_new_resolve));
-
-/*
- * Deprecated until Miguel likes it.
- *
- *	else if (!strcmp (object_id, "OAFIID:Bonobo_Moniker_Query"))
- *		
- *		return BONOBO_OBJECT (bonobo_moniker_simple_new (
- *			"query:", bonobo_moniker_query_resolve));
- */
-
-
-	else if (!strcmp (object_id, "OAFIID:Bonobo_MonikerExtender_file"))
+	else if (!strcmp (object_id, "OAFIID:GNOME_MonikerExtender_file"))
 		
 		return BONOBO_OBJECT (bonobo_moniker_extender_new (
 			bonobo_file_extender_resolve, NULL));
 
-	else if (!strcmp (object_id, "OAFIID:Bonobo_MonikerExtender_stream"))
-		
-		return BONOBO_OBJECT (bonobo_moniker_extender_new (
-			bonobo_stream_extender_resolve, NULL));
-
 	else
 		g_warning ("Failing to manufacture a '%s'", object_id);
 
diff --git a/monikers/gnome-moniker-std.h b/monikers/gnome-moniker-std.h
index 4b06bca..9f6eab8 100644
--- a/monikers/gnome-moniker-std.h
+++ b/monikers/gnome-moniker-std.h
@@ -1,5 +1,5 @@
-#ifndef _BONOBO_MONIKER_STD_H_
-#define _BONOBO_MONIKER_STD_H_
+#ifndef _GNOME_MONIKER_STD_H_
+#define _GNOME_MONIKER_STD_H_
 
 #include <bonobo/bonobo-moniker-simple.h>
 #include <bonobo/bonobo-moniker-extender.h>
@@ -9,33 +9,6 @@ Bonobo_Unknown bonobo_moniker_file_resolve    (BonoboMoniker               *moni
 					       const CORBA_char            *requested_interface,
 					       CORBA_Environment           *ev);
 
-Bonobo_Unknown bonobo_moniker_item_resolve    (BonoboMoniker               *moniker,
-					       const Bonobo_ResolveOptions *options,
-					       const CORBA_char            *requested_interface,
-					       CORBA_Environment           *ev);
-
-Bonobo_Unknown bonobo_moniker_oaf_resolve     (BonoboMoniker               *moniker,
-					       const Bonobo_ResolveOptions *options,
-					       const CORBA_char            *requested_interface,
-					       CORBA_Environment           *ev);
-
-Bonobo_Unknown bonobo_moniker_cache_resolve   (BonoboMoniker               *moniker,
-					       const Bonobo_ResolveOptions *options,
-					       const CORBA_char            *requested_interface,
-					       CORBA_Environment           *ev);
-
-Bonobo_Unknown bonobo_moniker_query_resolve   (BonoboMoniker               *moniker,
-					       const Bonobo_ResolveOptions *options,
-					       const CORBA_char            *requested_interface,
-					       CORBA_Environment           *ev);
-
-Bonobo_Unknown bonobo_moniker_new_resolve     (BonoboMoniker               *moniker,
-					       const Bonobo_ResolveOptions *options,
-					       const CORBA_char            *requested_interface,
-					       CORBA_Environment           *ev);
-
-/* extender functions */
-
 Bonobo_Unknown bonobo_file_extender_resolve   (BonoboMonikerExtender *extender,
 					       const Bonobo_Moniker   m,
 					       const Bonobo_ResolveOptions *options,
@@ -43,11 +16,4 @@ Bonobo_Unknown bonobo_file_extender_resolve   (BonoboMonikerExtender *extender,
 					       const CORBA_char      *requested_interface,
 					       CORBA_Environment     *ev);
 
-Bonobo_Unknown bonobo_stream_extender_resolve (BonoboMonikerExtender       *extender,
-					       const Bonobo_Moniker         m,
-					       const Bonobo_ResolveOptions *options,
-					       const CORBA_char            *display_name,
-					       const CORBA_char            *requested_interface,
-					       CORBA_Environment           *ev);
-
-#endif /* _BONOBO_MONIKER_STD_H_ */
+#endif /* _GNOME_MONIKER_STD_H_ */
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 43c5f98..663501d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,41 +1,14 @@
-noinst_PROGRAMS =		\
-	test-moniker		\
-	test-properties-server	\
-	test-properties-client	\
-	test-storage		\
-	test-event-source	\
-	test-object
+noinst_PROGRAMS = \
+	test-storage
 
-INCLUDES =	\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
-	-I$(srcdir) -I$(top_srcdir) 			\
-	-I.						\
-        -I$(includedir)                                 \
-	$(WARN_CFLAGS)					\
-	$(GLIB_CFLAGS)					\
-	$(ORBIT_CFLAGS)					\
-	$(OAF_CFLAGS)					\
-	$(LIBGNOMEBASE_CFLAGS)
+INCLUDES = \
+	-I$(srcdir) -I$(top_srcdir) \
+	-I. $(LIBGNOME_CFLAGS)
 
-LDADD =	$(top_builddir)/bonobo/libbonobo-2.la
-
-test_properties_server_SOURCES =			\
-	test-properties-server.c
-
-test_properties_client_SOURCES =			\
-	test-properties-client.c
+LDADD =	$(LIBGNOME_LIBS)
 
 test_storage_SOURCES = test-storage.c
 
-test_moniker_SOURCES = test-moniker.c
-
-test_object_SOURCES = test-object.c
-
-test_event_source_SOURCES = test-event-source.c
-
 TESTS_ENVIRONMENT =					\
-	LD_LIBRARY_PATH=$(top_builddir)/bonobo/.libs/	\
+	LD_LIBRARY_PATH=$(top_builddir)/libgnome/.libs/	\
 	BONOBO_PLUGIN_PATH=$(top_builddir)/storage-modules/.libs
-
-# test-storage
-TESTS = test-moniker test-event-source test-object
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]