[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/geas/src dataobject.h exceptions.h factory...
|
From: |
Neil Tiffin |
|
Subject: |
gnue/geas/src dataobject.h exceptions.h factory... |
|
Date: |
Sun, 10 Jun 2001 05:56:13 -0700 |
CVSROOT: /home/cvs
Module name: gnue
Changes by: Neil Tiffin <address@hidden> 01/06/10 05:56:12
Modified files:
geas/src : dataobject.h exceptions.h factory.h
geas-internal-classes.h geas-server.h
geas-skeleton.h globals.h objectlist.h query.h
schema.h servantlocator.h transaction.h
Log message:
Clean up header files (GNU format) for release.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/dataobject.h.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/exceptions.h.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/factory.h.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas-internal-classes.h.diff?cvsroot=OldCVS&tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas-server.h.diff?cvsroot=OldCVS&tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas-skeleton.h.diff?cvsroot=OldCVS&tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/globals.h.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectlist.h.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/query.h.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/schema.h.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/servantlocator.h.diff?cvsroot=OldCVS&tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/transaction.h.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: gnue/geas/src/dataobject.h
diff -u gnue/geas/src/dataobject.h:1.6 gnue/geas/src/dataobject.h:1.7
--- gnue/geas/src/dataobject.h:1.6 Tue Jan 30 11:59:44 2001
+++ gnue/geas/src/dataobject.h Sun Jun 10 05:56:12 2001
@@ -1,6 +1,8 @@
/*
- geas - GNU Enterprise Application Server
+ dataobject.h
+
+ Part of GNU Enterprise Application Server (GEAS)
Copyright (C) 2000 Free Software Foundation
@@ -17,56 +19,54 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
+
+ $Id: dataobject.h,v 1.7 2001/06/10 12:56:12 ntiffin Exp $
+
*/
#ifndef DATAOBJECT_H
#define DATAOBJECT_H
#include "geas-skeleton.h"
-
-GEAS_ObjectReference DataObject__get_objectID(GEAS_object_reference * id,
- CORBA_Environment * ev);
-CORBA_boolean DataObject_ofclass(GEAS_object_reference * id,
- CORBA_char * classname,
-
- CORBA_Environment * ev);
-CORBA_char *DataObject__get_classname(GEAS_object_reference * id,
- CORBA_Environment * ev);
-GEAS_classnames *DataObject__get_classes(GEAS_object_reference * id,
- CORBA_Environment * ev);
-GEAS_fieldlist *DataObject__get_allfields(GEAS_object_reference * id,
- CORBA_Environment * ev);
-GEAS_LookupOptions *DataObject_getLookupFieldOptions(GEAS_object_reference *
- id, char *field,
- CORBA_Environment * ev);
-void DataObject_setLookupField(GEAS_object_reference * id,
- GEAS_LookupOption * setting,
-
- CORBA_Environment * ev);
-CORBA_char *DataObject_getField(GEAS_object_reference * id,
- CORBA_char * fieldname, CORBA_Environment *
ev);
-void
- DataObject_setField(GEAS_object_reference * id, CORBA_char * fieldname,
- CORBA_char * value, CORBA_Environment
* ev);
-GEAS_DataObject DataObject_getReference(GEAS_object_reference * id,
- CORBA_char * fieldname,
- CORBA_Environment * ev);
-GEAS_ObjectList DataObject_getList(GEAS_object_reference * id,
- CORBA_char * field, CORBA_Environment * ev);
-void DataObject_insert(GEAS_object_reference * id, CORBA_char * fieldname,
- GEAS_DataObject obj, CORBA_Environment * ev);
-void DataObject_setReference(GEAS_object_reference * id,
- CORBA_char * fieldname, GEAS_DataObject obj,
- CORBA_Environment * ev);
-void DataObject_flush(GEAS_object_reference * id, CORBA_Environment * ev);
-void DataObject_delete(GEAS_object_reference * id,
- CORBA_Environment * ev);
-CORBA_char *DataObject_callMethod(GEAS_object_reference * id,
- CORBA_char * methodname,
- GEAS_Arguments * args,
-
+GEAS_ObjectReference DataObject__get_objectID (GEAS_object_reference * id,
+ CORBA_Environment * ev);
+CORBA_boolean DataObject_ofclass (GEAS_object_reference * id,
+ CORBA_char * classname,
CORBA_Environment * ev);
+CORBA_char *DataObject__get_classname (GEAS_object_reference * id,
+ CORBA_Environment * ev);
+GEAS_classnames *DataObject__get_classes (GEAS_object_reference * id,
+ CORBA_Environment * ev);
+GEAS_fieldlist *DataObject__get_allfields (GEAS_object_reference * id,
+ CORBA_Environment * ev);
+GEAS_LookupOptions *DataObject_getLookupFieldOptions (GEAS_object_reference *
+ id, char *field,
+ CORBA_Environment * ev);
+void DataObject_setLookupField (GEAS_object_reference * id,
+ GEAS_LookupOption * setting,
+ CORBA_Environment * ev);
+CORBA_char *DataObject_getField (GEAS_object_reference * id,
+ CORBA_char * fieldname,
+ CORBA_Environment * ev);
+void DataObject_setField (GEAS_object_reference * id, CORBA_char * fieldname,
+ CORBA_char * value, CORBA_Environment * ev);
+GEAS_DataObject DataObject_getReference (GEAS_object_reference * id,
+ CORBA_char * fieldname,
+ CORBA_Environment * ev);
+GEAS_ObjectList DataObject_getList (GEAS_object_reference * id,
+ CORBA_char * field,
+ CORBA_Environment * ev);
+void DataObject_insert (GEAS_object_reference * id, CORBA_char * fieldname,
+ GEAS_DataObject obj, CORBA_Environment * ev);
+void DataObject_setReference (GEAS_object_reference * id,
+ CORBA_char * fieldname, GEAS_DataObject obj,
+ CORBA_Environment * ev);
+void DataObject_flush (GEAS_object_reference * id, CORBA_Environment * ev);
+void DataObject_delete (GEAS_object_reference * id, CORBA_Environment * ev);
+CORBA_char *DataObject_callMethod (GEAS_object_reference * id,
+ CORBA_char * methodname,
+ GEAS_Arguments * args,
+ CORBA_Environment * ev);
#endif /* DATAOBJECT_H */
Index: gnue/geas/src/exceptions.h
diff -u gnue/geas/src/exceptions.h:1.7 gnue/geas/src/exceptions.h:1.8
--- gnue/geas/src/exceptions.h:1.7 Wed Feb 28 17:55:34 2001
+++ gnue/geas/src/exceptions.h Sun Jun 10 05:56:12 2001
@@ -1,5 +1,7 @@
/*
- geas - GNU Enterprise Application Server
+ exceptions.h
+
+ Part of GNU Enterprise Application Server (GEAS)
Copyright (C) 2001 Free Software Foundation
@@ -17,6 +19,8 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ $Id: exceptions.h,v 1.8 2001/06/10 12:56:12 ntiffin Exp $
+
*/
#ifndef MAKE_EXCEPTIONS_H
Index: gnue/geas/src/factory.h
diff -u gnue/geas/src/factory.h:1.3 gnue/geas/src/factory.h:1.4
--- gnue/geas/src/factory.h:1.3 Mon Feb 19 17:26:53 2001
+++ gnue/geas/src/factory.h Sun Jun 10 05:56:12 2001
@@ -1,6 +1,8 @@
/*
- geas - GNU Enterprise Application Server
+ factory.h
+
+ Part of GNU Enterprise Application Server (GEAS)
Copyright (C) 2000 Free Software Foundation
@@ -18,6 +20,8 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ $Id: factory.h,v 1.4 2001/06/10 12:56:12 ntiffin Exp $
+
*/
#ifndef CONNECTIONFACTORY_H
@@ -25,19 +29,19 @@
#include "geas.h"
-GEAS_Connection ConnectionFactory_guestLogin(CORBA_Environment * ev);
+GEAS_Connection ConnectionFactory_guestLogin (CORBA_Environment * ev);
-GEAS_Connection ConnectionFactory_unsecureLogin(const CORBA_char *username,
- const CORBA_char *password,
- CORBA_Environment *ev);
+GEAS_Connection ConnectionFactory_unsecureLogin (const CORBA_char * username,
+ const CORBA_char * password,
+ CORBA_Environment * ev);
-CORBA_char *ConnectionFactory_getAuthenticationKey(CORBA_char * username,
- CORBA_Environment * ev);
-GEAS_Connection ConnectionFactory_getConnection(CORBA_char * username,
- CORBA_char * passkey,
- CORBA_Environment * ev);
-GEAS_Connection ConnectionFactory_adminLogin(CORBA_char * username,
- CORBA_char * passkey,
- CORBA_Environment * ev);
+CORBA_char *ConnectionFactory_getAuthenticationKey (CORBA_char * username,
+ CORBA_Environment * ev);
+GEAS_Connection ConnectionFactory_getConnection (CORBA_char * username,
+ CORBA_char * passkey,
+ CORBA_Environment * ev);
+GEAS_Connection ConnectionFactory_adminLogin (CORBA_char * username,
+ CORBA_char * passkey,
+ CORBA_Environment * ev);
#endif /* CONNECTIONFACTORY_H */
Index: gnue/geas/src/geas-internal-classes.h
diff -u gnue/geas/src/geas-internal-classes.h:1.16
gnue/geas/src/geas-internal-classes.h:1.17
--- gnue/geas/src/geas-internal-classes.h:1.16 Fri Jun 1 17:24:33 2001
+++ gnue/geas/src/geas-internal-classes.h Sun Jun 10 05:56:12 2001
@@ -1,6 +1,8 @@
/*
- GEAS - GNU Enterprise Application Server
+ geas-internal-classes.h
+
+ Part of GNU Enterprise Application Server (GEAS)
Copyright (C) 2000 Free Software Foundation
@@ -17,6 +19,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ $Id: geas-internal-classes.h,v 1.17 2001/06/10 12:56:12 ntiffin Exp $
*/
@@ -48,375 +52,402 @@
/* a good reason to do otherwise ( ie: geas:: is the prefix for GEAS */
/* specific classes, so no conflict with non geas classes) */
-static void make_server_security_classes( odl_module *m )
+static void
+make_server_security_classes (odl_module * m)
{
- odl_class *c;
- odl_field *f;
- /* odl_index *i; */
- GList *body = NULL;
- GList *fields = NULL;
-
- /* ************************************ */
- /* class GEAS::user */
- c = odl_new_class( ODL_ACCESS_SYSTEM , "user" );
- odl_container_insert_container( m , c );
- c->base.parent = (odl_base *)m;
- c->base.access = ODL_ACCESS_PUBLIC;
- c->orderby = g_strdup("username");
- body = NULL;
-
- /* add field char username[32] */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_PUBLIC;
- f->base.name = g_strdup( "username" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_char;
- f->format = g_strdup("32");
- f->properties = ODL_PROP_NOTNULL;
- body = g_list_append( body , f );
-
- /* add field char username[32] */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_PUBLIC;
- f->base.name = g_strdup( "password" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_char;
- f->format = g_strdup("32");
- body = g_list_append( body , f );
-
- /* add field object _currenttransaction */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "_currenttransaction" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_object;
- body = g_list_append( body , f );
-
- /* add fields to class */
- if( c->contents )
- c->contents = g_list_concat( c->contents , body );
- else
- c->contents = body;
-
- /* add indexes */
- fields = g_list_append( NULL , g_strdup("username") );
- odl_make_index(c,TRUE,fields);
+ odl_class *c;
+ odl_field *f;
+ /* odl_index *i; */
+ GList *body = NULL;
+ GList *fields = NULL;
+
+ /* ************************************ */
+ /* class GEAS::user */
+ c = odl_new_class (ODL_ACCESS_SYSTEM, "user");
+ odl_container_insert_container (m, c);
+ c->base.parent = (odl_base *) m;
+ c->base.access = ODL_ACCESS_PUBLIC;
+ c->orderby = g_strdup ("username");
+ body = NULL;
+
+ /* add field char username[32] */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_PUBLIC;
+ f->base.name = g_strdup ("username");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_char;
+ f->format = g_strdup ("32");
+ f->properties = ODL_PROP_NOTNULL;
+ body = g_list_append (body, f);
+
+ /* add field char username[32] */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_PUBLIC;
+ f->base.name = g_strdup ("password");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_char;
+ f->format = g_strdup ("32");
+ body = g_list_append (body, f);
+
+ /* add field object _currenttransaction */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("_currenttransaction");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_object;
+ body = g_list_append (body, f);
+
+ /* add fields to class */
+ if (c->contents)
+ {
+ c->contents = g_list_concat (c->contents, body);
+ }
+ else
+ {
+ c->contents = body;
+ }
+
+ /* add indexes */
+ fields = g_list_append (NULL, g_strdup ("username"));
+ odl_make_index (c, TRUE, fields);
}
-static void make_server_transaction_classes( odl_module *m )
+static void
+make_server_transaction_classes (odl_module * m)
{
- odl_class *c;
- odl_field *f;
- GList *body = NULL;
- /* GList *fields = NULL; */
-
- /* ************************************ */
- /* make class GEAS::transaction */
- c = odl_new_class( ODL_ACCESS_SYSTEM , "transaction" );
- odl_container_insert_container( m , c );
- c->base.parent = (odl_base *)m;
- body = NULL;
-
- /* add field object _user */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "_user" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_object;
- f->properties = ODL_PROP_NOTNULL;
- body = g_list_append( body , f );
-
- /* add field bool open */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "open" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_bool;
- f->properties = ODL_PROP_NOTNULL;
- body = g_list_append( body , f );
-
- /* add fields to class */
- if( c->contents )
- c->contents = g_list_concat( c->contents , body );
- else
- c->contents = body;
+ odl_class *c;
+ odl_field *f;
+ GList *body = NULL;
+ /* GList *fields = NULL; */
+
+ /* ************************************ */
+ /* make class GEAS::transaction */
+ c = odl_new_class (ODL_ACCESS_SYSTEM, "transaction");
+ odl_container_insert_container (m, c);
+ c->base.parent = (odl_base *) m;
+ body = NULL;
+
+ /* add field object _user */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("_user");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_object;
+ f->properties = ODL_PROP_NOTNULL;
+ body = g_list_append (body, f);
+
+ /* add field bool open */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("open");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_bool;
+ f->properties = ODL_PROP_NOTNULL;
+ body = g_list_append (body, f);
+
+ /* add fields to class */
+ if (c->contents)
+ {
+ c->contents = g_list_concat (c->contents, body);
+ }
+ else
+ {
+ c->contents = body;
+ }
}
-static void make_server_list_handling_classes( odl_module *m )
+static void
+make_server_list_handling_classes (odl_module * m)
{
- odl_class *c;
- odl_field *f;
- GList *body = NULL;
- GList *fields = NULL;
-
- /* ************************************ */
- /* make class GEAS::listitem */
- c = odl_new_class( ODL_ACCESS_SYSTEM , "listitem" );
- odl_container_insert_container( m , c );
- c->base.parent = (odl_base *)m;
- body = NULL;
- c->orderby = g_strdup("position");
-
- /* add field unsigned int position */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "position" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_unsignedint;
- f->properties = ODL_PROP_NOTNULL;
- body = g_list_append( body , f );
-
- /* add field object listid */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "listid" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_object;
- f->properties = ODL_PROP_NOTNULL;
- body = g_list_append( body , f );
-
- /* add field object reference */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "reference" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_object;
- f->properties = ODL_PROP_NOTNULL;
- body = g_list_append( body , f );
-
- /* add fields to class */
- if( c->contents )
- c->contents = g_list_concat( c->contents , body );
- else
- c->contents = body;
-
- /* add indexes */
- fields = g_list_append( NULL , g_strdup("position") );
- fields = g_list_append( fields , g_strdup("listid") );
- odl_make_index(c,TRUE,fields);
-
- /* ************************************ */
- /* make class GEAS::listholder */
- c = odl_new_class( ODL_ACCESS_SYSTEM , "listholder" );
- odl_container_insert_container( m , c );
- c->base.parent = (odl_base *)m;
- body = NULL;
-
- /* add field unsigned int length; */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "length" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_unsignedint;
- f->properties = ODL_PROP_NOTNULL;
- body = g_list_append( body , f );
-
- /* add field text classname; */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "classname" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_text;
- f->properties = ODL_PROP_NOTNULL;
- body = g_list_append( body , f );
-
- /* add fields to class */
- if( c->contents )
- c->contents = g_list_concat( c->contents , body );
- else
- c->contents = body;
+ odl_class *c;
+ odl_field *f;
+ GList *body = NULL;
+ GList *fields = NULL;
+
+ /* ************************************ */
+ /* make class GEAS::listitem */
+ c = odl_new_class (ODL_ACCESS_SYSTEM, "listitem");
+ odl_container_insert_container (m, c);
+ c->base.parent = (odl_base *) m;
+ body = NULL;
+ c->orderby = g_strdup ("position");
+
+ /* add field unsigned int position */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("position");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_unsignedint;
+ f->properties = ODL_PROP_NOTNULL;
+ body = g_list_append (body, f);
+
+ /* add field object listid */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("listid");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_object;
+ f->properties = ODL_PROP_NOTNULL;
+ body = g_list_append (body, f);
+
+ /* add field object reference */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("reference");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_object;
+ f->properties = ODL_PROP_NOTNULL;
+ body = g_list_append (body, f);
+
+ /* add fields to class */
+ if (c->contents)
+ {
+ c->contents = g_list_concat (c->contents, body);
+ }
+ else
+ {
+ c->contents = body;
+ }
+
+ /* add indexes */
+ fields = g_list_append (NULL, g_strdup ("position"));
+ fields = g_list_append (fields, g_strdup ("listid"));
+ odl_make_index (c, TRUE, fields);
+
+ /* ************************************ */
+ /* make class GEAS::listholder */
+ c = odl_new_class (ODL_ACCESS_SYSTEM, "listholder");
+ odl_container_insert_container (m, c);
+ c->base.parent = (odl_base *) m;
+ body = NULL;
+
+ /* add field unsigned int length; */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("length");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_unsignedint;
+ f->properties = ODL_PROP_NOTNULL;
+ body = g_list_append (body, f);
+
+ /* add field text classname; */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("classname");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_text;
+ f->properties = ODL_PROP_NOTNULL;
+ body = g_list_append (body, f);
+
+ /* add fields to class */
+ if (c->contents)
+ {
+ c->contents = g_list_concat (c->contents, body);
+ }
+ else
+ {
+ c->contents = body;
+ }
}
-static void make_server_query_handling_classes( odl_module *m )
+static void
+make_server_query_handling_classes (odl_module * m)
{
- odl_class *c;
- odl_field *f;
- GList *body = NULL;
- /* GList *fields = NULL; */
-
- /* ************************************ */
- /* make class GEAS::searchcriteria */
- c = odl_new_class( ODL_ACCESS_SYSTEM , "searchcriteria" );
- odl_container_insert_container( m , c );
- c->base.parent = (odl_base *)m;
- body = NULL;
-
- /* add field object parent; */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "parent" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_object;
- f->properties = ODL_PROP_NONE;
- f->defaultval = g_strdup("");
- body = g_list_append( body , f );
-
- /* add field char classname<128>; */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "classname" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_char;
- f->format = g_strdup("128");
- f->properties = ODL_PROP_NONE;
- f->defaultval = g_strdup("unknown");
- body = g_list_append( body , f );
-
- /* add field char orderby<128>; */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "orderby" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_char;
- f->format = g_strdup("128");
- f->properties = ODL_PROP_NONE;
- f->defaultval = g_strdup("");
- body = g_list_append( body , f );
-
-
- /* add field bool reverse; */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "reverse" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_bool;
- f->properties = ODL_PROP_NONE;
- f->defaultval = g_strdup("F");
- body = g_list_append( body , f );
-
- /* add field int logic; */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "logic" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_int;
- f->properties = ODL_PROP_NONE;
- f->defaultval = g_strdup("1");
- body = g_list_append( body , f );
-
- /* add fields to class */
- if( c->contents )
- c->contents = g_list_concat( c->contents , body );
- else
- c->contents = body;
-
-
- /* ************************************ */
- /* make class GEAS::searchfield */
- c = odl_new_class( ODL_ACCESS_SYSTEM , "searchfield" );
- odl_container_insert_container( m , c );
- c->base.parent = (odl_base *)m;
- body = NULL;
-
- /* add field bool invert; */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "invert" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_bool;
- f->properties = ODL_PROP_NONE;
- f->defaultval = g_strdup("F");
- body = g_list_append( body , f );
-
- /* add field bool casesensitive; */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "casesensitive" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_bool;
- f->properties = ODL_PROP_NONE;
- f->defaultval = g_strdup("F");
- body = g_list_append( body , f );
-
- /* add field int test; */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "test" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_unsignedint;
- f->properties = ODL_PROP_NONE;
- f->defaultval = g_strdup("1");
- body = g_list_append( body , f );
-
- /* add field char field<128>; */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "field" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_char;
- f->properties = ODL_PROP_NONE;
- f->format = g_strdup("128");
- f->defaultval = g_strdup("");
- body = g_list_append( body , f );
-
- /* add field char value<128>; */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "value" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_char;
- f->properties = ODL_PROP_NONE;
- f->format = g_strdup("128");
- f->defaultval = g_strdup("");
- body = g_list_append( body , f );
-
-
- /* add field object constraint; */
- f = alloc_odl_item();
- f->base.parent = (odl_base *)c;
- f->base.access = ODL_ACCESS_SYSTEM;
- f->base.name = g_strdup( "constraint" );
- f->base.type = IT_field;
- f->fieldtype = FT_basic;
- f->datatype = DT_object;
- f->properties = ODL_PROP_NONE;
- body = g_list_append( body , f );
-
- /* add fields to class */
- if( c->contents )
- c->contents = g_list_concat( c->contents , body );
- else
- c->contents = body;
+ odl_class *c;
+ odl_field *f;
+ GList *body = NULL;
+ /* GList *fields = NULL; */
+
+ /* ************************************ */
+ /* make class GEAS::searchcriteria */
+ c = odl_new_class (ODL_ACCESS_SYSTEM, "searchcriteria");
+ odl_container_insert_container (m, c);
+ c->base.parent = (odl_base *) m;
+ body = NULL;
+
+ /* add field object parent; */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("parent");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_object;
+ f->properties = ODL_PROP_NONE;
+ f->defaultval = g_strdup ("");
+ body = g_list_append (body, f);
+
+ /* add field char classname<128>; */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("classname");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_char;
+ f->format = g_strdup ("128");
+ f->properties = ODL_PROP_NONE;
+ f->defaultval = g_strdup ("unknown");
+ body = g_list_append (body, f);
+
+ /* add field char orderby<128>; */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("orderby");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_char;
+ f->format = g_strdup ("128");
+ f->properties = ODL_PROP_NONE;
+ f->defaultval = g_strdup ("");
+ body = g_list_append (body, f);
+
+
+ /* add field bool reverse; */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("reverse");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_bool;
+ f->properties = ODL_PROP_NONE;
+ f->defaultval = g_strdup ("F");
+ body = g_list_append (body, f);
+
+ /* add field int logic; */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("logic");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_int;
+ f->properties = ODL_PROP_NONE;
+ f->defaultval = g_strdup ("1");
+ body = g_list_append (body, f);
+
+ /* add fields to class */
+ if (c->contents)
+ {
+ c->contents = g_list_concat (c->contents, body);
+ }
+ else
+ {
+ c->contents = body;
+ }
+
+ /* ************************************ */
+ /* make class GEAS::searchfield */
+ c = odl_new_class (ODL_ACCESS_SYSTEM, "searchfield");
+ odl_container_insert_container (m, c);
+ c->base.parent = (odl_base *) m;
+ body = NULL;
+
+ /* add field bool invert; */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("invert");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_bool;
+ f->properties = ODL_PROP_NONE;
+ f->defaultval = g_strdup ("F");
+ body = g_list_append (body, f);
+
+ /* add field bool casesensitive; */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("casesensitive");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_bool;
+ f->properties = ODL_PROP_NONE;
+ f->defaultval = g_strdup ("F");
+ body = g_list_append (body, f);
+
+ /* add field int test; */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("test");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_unsignedint;
+ f->properties = ODL_PROP_NONE;
+ f->defaultval = g_strdup ("1");
+ body = g_list_append (body, f);
+
+ /* add field char field<128>; */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("field");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_char;
+ f->properties = ODL_PROP_NONE;
+ f->format = g_strdup ("128");
+ f->defaultval = g_strdup ("");
+ body = g_list_append (body, f);
+
+ /* add field char value<128>; */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("value");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_char;
+ f->properties = ODL_PROP_NONE;
+ f->format = g_strdup ("128");
+ f->defaultval = g_strdup ("");
+ body = g_list_append (body, f);
+
+
+ /* add field object constraint; */
+ f = alloc_odl_item ();
+ f->base.parent = (odl_base *) c;
+ f->base.access = ODL_ACCESS_SYSTEM;
+ f->base.name = g_strdup ("constraint");
+ f->base.type = IT_field;
+ f->fieldtype = FT_basic;
+ f->datatype = DT_object;
+ f->properties = ODL_PROP_NONE;
+ body = g_list_append (body, f);
+
+ /* add fields to class */
+ if (c->contents)
+ {
+ c->contents = g_list_concat (c->contents, body);
+ }
+ else
+ {
+ c->contents = body;
+ }
}
/* main function */
@@ -424,22 +455,23 @@
* Calls a number of other functions to make classes used by different
* parts of the system.
*/
-static void make_server_classes( void )
+static void
+make_server_classes (void)
{
- odl_module *m;
+ odl_module *m;
- /* create GEAS module */
- m = odl_new_module( ODL_ACCESS_SYSTEM , "geas" );
- if( m )
- {
- odl_container_insert_container( odl_tree_get_root(all_classes) , m );
- }
-
- /* make classes */
- make_server_list_handling_classes( m );
- make_server_security_classes( m );
- make_server_transaction_classes( m );
- make_server_query_handling_classes( m );
+ /* create GEAS module */
+ m = odl_new_module (ODL_ACCESS_SYSTEM, "geas");
+ if (m)
+ {
+ odl_container_insert_container (odl_tree_get_root (all_classes), m);
+ }
+
+ /* make classes */
+ make_server_list_handling_classes (m);
+ make_server_security_classes (m);
+ make_server_transaction_classes (m);
+ make_server_query_handling_classes (m);
}
#endif /* GEAS_INTERNAL_CLASSES_H */
Index: gnue/geas/src/geas-server.h
diff -u gnue/geas/src/geas-server.h:1.45 gnue/geas/src/geas-server.h:1.46
--- gnue/geas/src/geas-server.h:1.45 Sat Jun 9 08:20:37 2001
+++ gnue/geas/src/geas-server.h Sun Jun 10 05:56:12 2001
@@ -20,7 +20,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: geas-server.h,v 1.45 2001/06/09 15:20:37 ntiffin Exp $
+ $Id: geas-server.h,v 1.46 2001/06/10 12:56:12 ntiffin Exp $
*/
/** \file geas-server.h
@@ -73,7 +73,8 @@
error_message_out("warning",__FILE__,__PRETTY_FUNCTION__,__LINE__ , fmt ,
##args )
/** \brief display message then exit immediately. */
-#define fatal_error(fmt,args...)
do_fatal_error(__FILE__,__LINE__,__PRETTY_FUNCTION__,fmt,##args)
+#define fatal_error(fmt,args...) \
+do_fatal_error(__FILE__,__LINE__,__PRETTY_FUNCTION__,fmt,##args)
/** \brief Holds current configuration information
*/
@@ -84,10 +85,10 @@
guint64 cache_maximum_size;
};
-/* global variables */
+/** \brief global variables */
extern struct ServerSettings settings;
-extern int debuglevel; /* configurable debugging output detail :
+extern int debuglevel; /** \brief configurable debugging output
detail :
1-10, 1 = low detail, 10 = high detail */
extern odl_tree *all_classes;
Index: gnue/geas/src/geas-skeleton.h
diff -u gnue/geas/src/geas-skeleton.h:1.27 gnue/geas/src/geas-skeleton.h:1.28
--- gnue/geas/src/geas-skeleton.h:1.27 Sat Jun 9 08:20:37 2001
+++ gnue/geas/src/geas-skeleton.h Sun Jun 10 05:56:12 2001
@@ -20,7 +20,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: geas-skeleton.h,v 1.27 2001/06/09 15:20:37 ntiffin Exp $
+ $Id: geas-skeleton.h,v 1.28 2001/06/10 12:56:12 ntiffin Exp $
*/
#ifndef SKELETON_H
@@ -31,7 +31,7 @@
#include "geas.h"
/** \brief Prepare servants for handling objects. */
-int initialise_object_servants(PortableServer_POA root_poa);
+int initialise_object_servants (PortableServer_POA root_poa);
#define OBJECTTYPE_CONNECTION "01"
#define OBJECTTYPE_DATA "02"
@@ -40,107 +40,123 @@
#define OBJECTTYPE_TRANSACTION "05"
#define OBJECTTYPE_QUERY "06"
#define OBJECTTYPE_CONSTRAINT "07"
-enum object_ref_type {
- RT_connection,RT_data,RT_list,RT_admin,RT_transaction,
- RT_constraint,RT_query
+
+enum object_ref_type
+{
+ RT_connection, RT_data, RT_list, RT_admin, RT_transaction,
+ RT_constraint, RT_query
};
/* returns NULL on error, otherwise a pointer to a string. g_free() the result
once done */
-char *reference_to_string(PortableServer_ObjectId * oid);
+char *reference_to_string (PortableServer_ObjectId * oid);
-/*
- * information about an arbitrary GEAS class.
+/**
+ * \brief Information about an arbitrary GEAS class.
* ie, ObjectList, DataObject and subclasses (business objects), etc
*/
typedef struct GEAS_object_reference
- {
- enum object_ref_type type;
- char *listid;
- char *username;
- char *classname;
- char *objectid;
- char *uniqueid;
- char *sessionid;
- char *parentid;
-
- /* read from database */
- char *currenttransaction;
- gboolean transactionopen;
-
- /* created in geas-skeleton.c for use in functions called,
- * in order to call methods on the server */
- GEAS_Connection server;
- struct GEAS_object_reference *serverid;
- } GEAS_object_reference;
+{
+ enum object_ref_type type;
+ char *listid;
+ char *username;
+ char *classname;
+ char *objectid;
+ char *uniqueid;
+ char *sessionid;
+ char *parentid;
+
+ /* read from database */
+ char *currenttransaction;
+ gboolean transactionopen;
+
+ /* created in geas-skeleton.c for use in functions called,
+ * in order to call methods on the server */
+ GEAS_Connection server;
+ struct GEAS_object_reference *serverid;
+}
+GEAS_object_reference;
/* Business Object Keys */
typedef unsigned char *ObjectKey;
-unsigned long int object_key_size( ObjectKey key );
-ObjectKey create_new_object_key (void);
-void free_object_key ( ObjectKey key );
-const char *object_key_as_string ( ObjectKey key );
-void print_object_key ( FILE *fp , ObjectKey key );
+unsigned long int object_key_size (ObjectKey key);
+ObjectKey create_new_object_key (void);
+void free_object_key (ObjectKey key);
+const char *object_key_as_string (ObjectKey key);
+void print_object_key (FILE * fp, ObjectKey key);
-ObjectKey object_key_from_string( const char *str );
+ObjectKey object_key_from_string (const char *str);
-void cleanup_oid( char *oid );
+void cleanup_oid (char *oid);
/* Business Object Identifiers */
typedef struct ObjectIdentifier
{
- char *classname;
- char *key;
+ char *classname;
+ char *key;
}
ObjectIdentifier;
-ObjectIdentifier *create_object_identifier(const char *classname,
- const char *key);
-void free_object_identifier(ObjectIdentifier * id);
+ObjectIdentifier *create_object_identifier (const char *classname,
+ const char *key);
+void free_object_identifier (ObjectIdentifier * id);
#ifdef DEBUG
- void display_geas_object_reference( GEAS_object_reference *oid );
+void display_geas_object_reference (GEAS_object_reference * oid);
#else
- #define display_geas_object_reference(oid) /* empty */
+#define display_geas_object_reference(oid) /* empty */
#endif
-
-/* Convert a CORBA object ID to a GEAS internal object ID (ASCII) */
-GEAS_object_reference *corba_id_to_geas_reference( PortableServer_ObjectId
*oid , CORBA_Environment *ev );
-/* Convert a CORBA object reference to a GEAS internal object ID (ASCII) */
-GEAS_object_reference *corba_object_to_geas_reference( PortableServer_POA poa
, CORBA_Object obj , CORBA_Environment *ev );
+/** \briefConvert a CORBA object ID to a GEAS internal object ID (ASCII) */
+GEAS_object_reference *corba_id_to_geas_reference (PortableServer_ObjectId *
+ oid,
+ CORBA_Environment * ev);
-/* TDB: handle 'Current' interface */
-GEAS_object_reference *current_object_to_geas_reference( CORBA_Environment *ev
);
+/** \brief Convert a CORBA object reference to a GEAS internal object ID
(ASCII) */
+GEAS_object_reference *corba_object_to_geas_reference (PortableServer_POA poa,
+ CORBA_Object obj,
+ CORBA_Environment *
+ ev);
-/* Make a CORBA object reference to a GEAS object */
+/** \brief TDB: handle 'Current' interface */
+GEAS_object_reference *current_object_to_geas_reference (CORBA_Environment *
+ ev);
+/** \brief Make a CORBA object reference to a GEAS object */
CORBA_Object
-make_connection_reference( const char *username , const char *session ,
CORBA_Environment *ev );
+make_connection_reference (const char *username, const char *session,
+ CORBA_Environment * ev);
CORBA_Object
-make_transaction_reference( const char *username , const char *objectid ,
- const char *sessionid, CORBA_Environment *ev );
+make_transaction_reference (const char *username, const char *objectid,
+ const char *sessionid, CORBA_Environment * ev);
CORBA_Object
-make_admin_reference( const char *username , const char *sessionid,
CORBA_Environment *ev );
+make_admin_reference (const char *username, const char *sessionid,
+ CORBA_Environment * ev);
CORBA_Object
-make_list_reference( const char *listid , const char *username , const char
*sessionid, CORBA_Environment *ev );
+make_list_reference (const char *listid, const char *username,
+ const char *sessionid, CORBA_Environment * ev);
CORBA_Object
-make_dataobject_reference( const char *objectclass , const char *objectid ,
const char *username , const char *sessionid, CORBA_Environment *ev );
+make_dataobject_reference (const char *objectclass, const char *objectid,
+ const char *username, const char *sessionid,
+ CORBA_Environment * ev);
CORBA_Object
-make_query_reference( const char *uniqueid , const char *username , const char
*sessionid, CORBA_Environment *ev );
+make_query_reference (const char *uniqueid, const char *username,
+ const char *sessionid, CORBA_Environment * ev);
CORBA_Object
-make_constraint_reference( const char *uniqueid , const char *parentid , const
char *username , const char *sessionid, CORBA_Environment *ev );
+make_constraint_reference (const char *uniqueid, const char *parentid,
+ const char *username, const char *sessionid,
+ CORBA_Environment * ev);
/* free memory */
-void free_geas_object_reference( GEAS_object_reference *oid );
+void free_geas_object_reference (GEAS_object_reference * oid);
-void refill_oid_buffer( int max );
+void refill_oid_buffer (int max);
GEAS_ConnectionFactory
-impl_GEAS_ConnectionFactory__create(PortableServer_POA poa,
- CORBA_Environment * ev);
+impl_GEAS_ConnectionFactory__create (PortableServer_POA poa,
+ CORBA_Environment * ev);
#endif /* SKELETON_H */
Index: gnue/geas/src/globals.h
diff -u gnue/geas/src/globals.h:1.2 gnue/geas/src/globals.h:1.3
--- gnue/geas/src/globals.h:1.2 Thu Jun 7 09:18:37 2001
+++ gnue/geas/src/globals.h Sun Jun 10 05:56:12 2001
@@ -1,7 +1,9 @@
/*
- GEAS - GNU Enterprise Application Server
+ globals.h
+
+ GNU Enterprise Application Server (GEAS)
- Copyright (C) 2000 Free Software Foundation
+ Copyright (C) 2000-2001 Free Software Foundation
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,10 +18,12 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ $Id: globals.h,v 1.3 2001/06/10 12:56:12 ntiffin Exp $
*/
-/* This file defines some globally used CORBA-dependent stuff. It is
+/** \file This file defines some globally used CORBA-dependent stuff. It is
a temporary hack needed during the cleanup. */
#ifndef GLOBALS_H
Index: gnue/geas/src/objectlist.h
diff -u gnue/geas/src/objectlist.h:1.6 gnue/geas/src/objectlist.h:1.7
--- gnue/geas/src/objectlist.h:1.6 Wed Jan 24 18:34:13 2001
+++ gnue/geas/src/objectlist.h Sun Jun 10 05:56:12 2001
@@ -1,6 +1,8 @@
/*
- geas - GNU Enterprise Application Server
+ objectlist.h
+
+ Part of GNU Enterprise Application Server (GEAS)
Copyright (C) 2000 Free Software Foundation
@@ -17,6 +19,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ $Id: objectlist.h,v 1.7 2001/06/10 12:56:12 ntiffin Exp $
*/
@@ -26,42 +30,52 @@
#include "geas-skeleton.h"
void
- ObjectList_appendObject(GEAS_object_reference * id, const GEAS_DataObject
obj,
- CORBA_Environment * ev);
-void
- ObjectList_removeEntry(GEAS_object_reference * id, CORBA_unsigned_long index,
- CORBA_Environment * ev);
-void
-ObjectList_resort(GEAS_object_reference *id,
- CORBA_char * fieldname,
- CORBA_boolean ascending,
- CORBA_Environment * ev);
+ObjectList_appendObject (GEAS_object_reference * id,
+ const GEAS_DataObject obj, CORBA_Environment * ev);
+
+void ObjectList_removeEntry (GEAS_object_reference * id,
+ CORBA_unsigned_long index,
+ CORBA_Environment * ev);
+
+void ObjectList_resort (GEAS_object_reference * id, CORBA_char * fieldname,
+ CORBA_boolean ascending, CORBA_Environment * ev);
+
+CORBA_unsigned_long ObjectList__get_length (GEAS_object_reference * id,
+ CORBA_Environment * ev);
+
+GEAS_objectslist *ObjectList__get_objects (GEAS_object_reference * id,
+ CORBA_Environment * ev);
+
+CORBA_char *ObjectList__get_classname (GEAS_object_reference * id,
+ CORBA_Environment * ev);
+
+GEAS_DataObject ObjectList_getEntry (GEAS_object_reference * id, int index,
+ CORBA_Environment * ev);
+
+CORBA_unsigned_long ObjectList_hideObjects (GEAS_object_reference * id,
+ CORBA_char * fieldname,
+ CORBA_char * compare,
+ CORBA_char * value,
+ CORBA_Environment * ev);
+
+CORBA_unsigned_long ObjectList_showObjects (GEAS_object_reference * id,
+ CORBA_char * fieldname,
+ CORBA_char * compare,
+ CORBA_char * value,
+ CORBA_Environment * ev);
+
+void ObjectList_showAll (GEAS_object_reference * id, CORBA_Environment * ev);
-CORBA_unsigned_long ObjectList__get_length(GEAS_object_reference * id,
- CORBA_Environment * ev);
-GEAS_objectslist *ObjectList__get_objects(GEAS_object_reference * id,
- CORBA_Environment * ev);
-CORBA_char *ObjectList__get_classname(GEAS_object_reference * id,
- CORBA_Environment * ev);
-GEAS_DataObject ObjectList_getEntry(GEAS_object_reference * id, int index,
- CORBA_Environment * ev);
-CORBA_unsigned_long ObjectList_hideObjects(GEAS_object_reference * id,
- CORBA_char * fieldname,
- CORBA_char * compare,
- CORBA_char * value,
- CORBA_Environment * ev);
-CORBA_unsigned_long ObjectList_showObjects(GEAS_object_reference * id,
- CORBA_char * fieldname,
- CORBA_char * compare,
- CORBA_char * value,
- CORBA_Environment * ev);
-void ObjectList_showAll(GEAS_object_reference * id, CORBA_Environment * ev);
-CORBA_unsigned_long ObjectList_applyFilter(GEAS_object_reference * id,
- CORBA_Environment * ev);
-CORBA_boolean ObjectList__get_delayFilter(GEAS_object_reference * id,
- CORBA_Environment * ev);
-void ObjectList__set_delayFilter(GEAS_object_reference * id,
- CORBA_boolean value, CORBA_Environment * ev);
-void ObjectList_release(GEAS_object_reference * id, CORBA_Environment * ev);
+CORBA_unsigned_long ObjectList_applyFilter (GEAS_object_reference * id,
+ CORBA_Environment * ev);
+
+CORBA_boolean ObjectList__get_delayFilter (GEAS_object_reference * id,
+ CORBA_Environment * ev);
+
+void ObjectList__set_delayFilter (GEAS_object_reference * id,
+ CORBA_boolean value,
+ CORBA_Environment * ev);
+
+void ObjectList_release (GEAS_object_reference * id, CORBA_Environment * ev);
#endif
Index: gnue/geas/src/query.h
diff -u gnue/geas/src/query.h:1.3 gnue/geas/src/query.h:1.4
--- gnue/geas/src/query.h:1.3 Thu Mar 22 19:57:16 2001
+++ gnue/geas/src/query.h Sun Jun 10 05:56:12 2001
@@ -1,6 +1,8 @@
/*
- geas - GNU Enterprise Application Server
+ query.h
+
+ Part of GNU Enterprise Application Server (GEAS)
Copyright (C) 2000 Free Software Foundation
@@ -17,6 +19,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ $Id: query.h,v 1.4 2001/06/10 12:56:12 ntiffin Exp $
*/
@@ -25,33 +29,34 @@
#include "geas.h"
-GEAS_Query_logictype Constraint__get_logic(GEAS_object_reference * id,
- CORBA_Environment * ev);
-void Constraint__set_logic(GEAS_object_reference * id, GEAS_Query_logictype
value,
- CORBA_Environment * ev);
-void Constraint_addField(GEAS_object_reference * id, GEAS_Query_Field * field,
+GEAS_Query_logictype Constraint__get_logic (GEAS_object_reference * id,
+ CORBA_Environment * ev);
+void Constraint__set_logic (GEAS_object_reference * id,
+ GEAS_Query_logictype value,
+ CORBA_Environment * ev);
+void Constraint_addField (GEAS_object_reference * id,
+ GEAS_Query_Field * field, CORBA_Environment * ev);
+GEAS_Query_Constraint Constraint_newConstraint (GEAS_object_reference * id,
+ CORBA_Environment * ev);
+
+
+void Query_release (GEAS_object_reference * id, CORBA_Environment * ev);
+void Query_clear (GEAS_object_reference * id, CORBA_Environment * ev);
+
+CORBA_char *Query__get_orderby (GEAS_object_reference * id,
+ CORBA_Environment * ev);
+void Query__set_orderby (GEAS_object_reference * id, CORBA_char * value,
CORBA_Environment * ev);
-GEAS_Query_Constraint Constraint_newConstraint(GEAS_object_reference * id,
- CORBA_Environment * ev);
-
-
-void Query_release(GEAS_object_reference * id, CORBA_Environment * ev);
-void Query_clear(GEAS_object_reference * id, CORBA_Environment * ev);
+CORBA_boolean Query__get_reverse (GEAS_object_reference * id,
+ CORBA_Environment * ev);
+void Query__set_reverse (GEAS_object_reference * id, CORBA_boolean value,
+ CORBA_Environment * ev);
-CORBA_char *Query__get_orderby(GEAS_object_reference * id,
- CORBA_Environment * ev);
-void Query__set_orderby(GEAS_object_reference * id, CORBA_char * value,
- CORBA_Environment * ev);
-CORBA_boolean Query__get_reverse(GEAS_object_reference * id,
- CORBA_Environment * ev);
-void Query__set_reverse(GEAS_object_reference * id, CORBA_boolean value,
- CORBA_Environment * ev);
-
-void Query__set_classname(GEAS_object_reference *id,
- CORBA_char *value, CORBA_Environment *ev);
-CORBA_char *Query__get_classname(GEAS_object_reference *id,
- CORBA_Environment *ev);
-GEAS_ObjectReference
-Query__get_id(GEAS_object_reference * id, CORBA_Environment * ev);
+void Query__set_classname (GEAS_object_reference * id,
+ CORBA_char * value, CORBA_Environment * ev);
+CORBA_char *Query__get_classname (GEAS_object_reference * id,
+ CORBA_Environment * ev);
+GEAS_ObjectReference
+Query__get_id (GEAS_object_reference * id, CORBA_Environment * ev);
#endif /* QUERY_H */
Index: gnue/geas/src/schema.h
diff -u gnue/geas/src/schema.h:1.3 gnue/geas/src/schema.h:1.4
--- gnue/geas/src/schema.h:1.3 Thu Mar 22 19:57:16 2001
+++ gnue/geas/src/schema.h Sun Jun 10 05:56:12 2001
@@ -1,5 +1,7 @@
/*
- geas - GNU Enterprise Application Server
+ schema.h
+
+ Part of GNU Enterprise Application Server (GEAS)
Copyright (C) 2001 Free Software Foundation
@@ -16,6 +18,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ $id$
*/
@@ -32,8 +36,8 @@
* \param ev CORBA environment variable
*/
-GEAS_classnames *
-schema_list_classes( GEAS_object_reference * id , CORBA_Environment *ev );
+GEAS_classnames *schema_list_classes (GEAS_object_reference * id,
+ CORBA_Environment * ev);
/** \brief Get the definition of a single class
* \return
@@ -43,19 +47,19 @@
* be included. Parents are always identified.
* \param ev CORBA environment variable
*/
-GEAS_ClassDefinition *
-schema_get_class( GEAS_object_reference * id,
- const char *name , gboolean includeinherited ,
- CORBA_Environment *ev );
-
-GEAS_fieldlist *
-schema_get_fields( GEAS_object_reference * id,
- const char *name , gboolean includeinherited ,
- CORBA_Environment *ev );
+GEAS_ClassDefinition *schema_get_class (GEAS_object_reference * id,
+ const char *name,
+ gboolean includeinherited,
+ CORBA_Environment * ev);
+
+GEAS_fieldlist *schema_get_fields (GEAS_object_reference * id,
+ const char *name,
+ gboolean includeinherited,
+ CORBA_Environment * ev);
/** \brief Get full schema (Not yet implemented)
*/
-GEAS_classlist *
-schema_get_all( GEAS_object_reference * id , CORBA_Environment *ev );
+GEAS_classlist *schema_get_all (GEAS_object_reference * id,
+ CORBA_Environment * ev);
#endif
Index: gnue/geas/src/servantlocator.h
diff -u gnue/geas/src/servantlocator.h:1.15 gnue/geas/src/servantlocator.h:1.16
--- gnue/geas/src/servantlocator.h:1.15 Sat Jun 9 16:06:40 2001
+++ gnue/geas/src/servantlocator.h Sun Jun 10 05:56:12 2001
@@ -1,5 +1,7 @@
/*
- geas - GNU Enterprise Application Server
+ servantlocator.h
+
+ Part of GNU Enterprise Application Server (GEAS)
Copyright (C) 2000 Free Software Foundation
@@ -16,6 +18,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ $Id: servantlocator.h,v 1.16 2001/06/10 12:56:12 ntiffin Exp $
*/
@@ -24,239 +28,292 @@
#include "objectcache/objectcache.h"
-extern POA_GEAS_Transaction poa_geas_transaction_servant;
-extern POA_GEAS_Connection poa_geas_connection_servant;
-extern POA_GEAS_DataObject poa_geas_dataobject_servant;
-extern POA_GEAS_ObjectList poa_geas_objectlist_servant;
-extern POA_GEAS_Admin poa_geas_admin_servant;
+extern POA_GEAS_Transaction poa_geas_transaction_servant;
+extern POA_GEAS_Connection poa_geas_connection_servant;
+extern POA_GEAS_DataObject poa_geas_dataobject_servant;
+extern POA_GEAS_ObjectList poa_geas_objectlist_servant;
+extern POA_GEAS_Admin poa_geas_admin_servant;
extern POA_GEAS_Query_Constraint poa_geas_query_constraint_servant;
-extern POA_GEAS_Query_Query poa_geas_query_query_servant;
+extern POA_GEAS_Query_Query poa_geas_query_query_servant;
/* prototype: get GEAS_object_reference - internal ID used by this object */
-static GEAS_object_reference *
- get_current_object_id( PortableServer_Servant servant , PortableServer_POA
poa , CORBA_Environment *ev );
+static GEAS_object_reference *get_current_object_id (PortableServer_Servant
+ servant,
+ PortableServer_POA poa,
+ CORBA_Environment * ev);
+
+void create_fake_servants (PortableServer_POA root_poa,
+ CORBA_Environment * ev);
+void free_fake_servants (void);
-void create_fake_servants( PortableServer_POA root_poa , CORBA_Environment *ev
);
-void free_fake_servants(void );
-
/* locator functions */
-static PortableServer_Servant preinvoke_query (PortableServer_ObjectId
*oid,PortableServer_POA adapter, CORBA_Identifier
op_name,PortableServer_ServantLocator_Cookie *cookie)
+static PortableServer_Servant
+preinvoke_query (PortableServer_ObjectId * oid, PortableServer_POA adapter,
+ CORBA_Identifier op_name,
+ PortableServer_ServantLocator_Cookie * cookie)
{
- /* Question: should this even exist? :) */
- return( (PortableServer_Servant)&poa_geas_query_query_servant );
+ /* Question: should this even exist? :) */
+ return ((PortableServer_Servant) & poa_geas_query_query_servant);
}
-static void postinvoke_query (PortableServer_Servant
s,PortableServer_ObjectId *oid,PortableServer_POA adapter, CORBA_Identifier
op_name,PortableServer_ServantLocator_Cookie cookie, PortableServer_Servant
servant)
+static void
+postinvoke_query (PortableServer_Servant s, PortableServer_ObjectId * oid,
+ PortableServer_POA adapter, CORBA_Identifier op_name,
+ PortableServer_ServantLocator_Cookie cookie,
+ PortableServer_Servant servant)
{
}
-static PortableServer_Servant preinvoke_constraint (PortableServer_ObjectId
*oid,PortableServer_POA adapter, CORBA_Identifier
op_name,PortableServer_ServantLocator_Cookie *cookie)
+static PortableServer_Servant
+preinvoke_constraint (PortableServer_ObjectId * oid,
+ PortableServer_POA adapter, CORBA_Identifier op_name,
+ PortableServer_ServantLocator_Cookie * cookie)
{
- /* Question: should this even exist? :) */
- return( (PortableServer_Servant)&poa_geas_query_constraint_servant );
+ /* Question: should this even exist? :) */
+ return ((PortableServer_Servant) & poa_geas_query_constraint_servant);
}
-static void postinvoke_constraint (PortableServer_Servant
s,PortableServer_ObjectId *oid,PortableServer_POA adapter, CORBA_Identifier
op_name,PortableServer_ServantLocator_Cookie cookie, PortableServer_Servant
servant)
+static void
+postinvoke_constraint (PortableServer_Servant s,
+ PortableServer_ObjectId * oid,
+ PortableServer_POA adapter, CORBA_Identifier op_name,
+ PortableServer_ServantLocator_Cookie cookie,
+ PortableServer_Servant servant)
{
}
-static PortableServer_Servant preinvoke_connection (PortableServer_ObjectId
*oid,PortableServer_POA adapter, CORBA_Identifier
op_name,PortableServer_ServantLocator_Cookie *cookie)
+static PortableServer_Servant
+preinvoke_connection (PortableServer_ObjectId * oid,
+ PortableServer_POA adapter, CORBA_Identifier op_name,
+ PortableServer_ServantLocator_Cookie * cookie)
{
- /* Question: should this even exist? :) */
- return( (PortableServer_Servant)&poa_geas_connection_servant );
+ /* Question: should this even exist? :) */
+ return ((PortableServer_Servant) & poa_geas_connection_servant);
}
-static void postinvoke_connection (PortableServer_Servant
s,PortableServer_ObjectId *oid,PortableServer_POA adapter, CORBA_Identifier
op_name,PortableServer_ServantLocator_Cookie cookie, PortableServer_Servant
servant)
+static void
+postinvoke_connection (PortableServer_Servant s,
+ PortableServer_ObjectId * oid,
+ PortableServer_POA adapter, CORBA_Identifier op_name,
+ PortableServer_ServantLocator_Cookie cookie,
+ PortableServer_Servant servant)
{
}
-static PortableServer_Servant preinvoke_transaction (PortableServer_ObjectId
*oid,PortableServer_POA adapter, CORBA_Identifier
op_name,PortableServer_ServantLocator_Cookie *cookie)
+static PortableServer_Servant
+preinvoke_transaction (PortableServer_ObjectId * oid,
+ PortableServer_POA adapter, CORBA_Identifier op_name,
+ PortableServer_ServantLocator_Cookie * cookie)
{
- /* Question: should this even exist? :) */
- return( (PortableServer_Servant)&poa_geas_transaction_servant );
+ /* Question: should this even exist? :) */
+ return ((PortableServer_Servant) & poa_geas_transaction_servant);
}
-static void postinvoke_transaction (PortableServer_Servant
s,PortableServer_ObjectId *oid,PortableServer_POA adapter, CORBA_Identifier
op_name,PortableServer_ServantLocator_Cookie cookie, PortableServer_Servant
servant)
+static void
+postinvoke_transaction (PortableServer_Servant s,
+ PortableServer_ObjectId * oid,
+ PortableServer_POA adapter, CORBA_Identifier op_name,
+ PortableServer_ServantLocator_Cookie cookie,
+ PortableServer_Servant servant)
{
}
-static PortableServer_Servant preinvoke_objectlist (PortableServer_Servant
servant,PortableServer_ObjectId *oid,PortableServer_POA adapter,
CORBA_Identifier op_name,PortableServer_ServantLocator_Cookie *cookie)
+static PortableServer_Servant
+preinvoke_objectlist (PortableServer_Servant servant,
+ PortableServer_ObjectId * oid,
+ PortableServer_POA adapter, CORBA_Identifier op_name,
+ PortableServer_ServantLocator_Cookie * cookie)
{
- /* TODO: check for existance of the object with the given ID, and return
NULL if not found */
- GEAS_object_reference *id = NULL;
- PortableServer_Servant retval = NULL;
- CORBA_Environment ev;
+ /* TODO: check for existance of the object with the given ID, and return
NULL if not found */
+ GEAS_object_reference *id = NULL;
+ PortableServer_Servant retval = NULL;
+ CORBA_Environment ev;
- CORBA_exception_init(&ev);
+ CORBA_exception_init (&ev);
- id = corba_id_to_geas_reference(oid,&ev);
- if( ev._major != CORBA_NO_EXCEPTION )
- {
- errormsg( CORBA_exception_id(&ev) );
- CORBA_exception_free(&ev);
- return( NULL );
- }
+ id = corba_id_to_geas_reference (oid, &ev);
+ if (ev._major != CORBA_NO_EXCEPTION)
+ {
+ errormsg (CORBA_exception_id (&ev));
+ CORBA_exception_free (&ev);
+ return (NULL);
+ }
- CORBA_exception_free(&ev);
- if( id )
- {
- if( oc_validate_object("geas::listholder",id->listid) )
- retval = (PortableServer_Servant)&poa_geas_objectlist_servant;
- free_geas_object_reference( id );
- }
+ CORBA_exception_free (&ev);
+ if (id)
+ {
+ if (oc_validate_object ("geas::listholder", id->listid))
+ retval = (PortableServer_Servant) & poa_geas_objectlist_servant;
+ free_geas_object_reference (id);
+ }
- return( retval );
+ return (retval);
}
-static void postinvoke_objectlist (PortableServer_Servant
s,PortableServer_ObjectId *oid,PortableServer_POA adapter, CORBA_Identifier
op_name,PortableServer_ServantLocator_Cookie cookie, PortableServer_Servant
servant)
+static void
+postinvoke_objectlist (PortableServer_Servant s,
+ PortableServer_ObjectId * oid,
+ PortableServer_POA adapter, CORBA_Identifier op_name,
+ PortableServer_ServantLocator_Cookie cookie,
+ PortableServer_Servant servant)
{
}
-static PortableServer_Servant preinvoke_dataobject (PortableServer_Servant
servant,PortableServer_ObjectId *oid,PortableServer_POA adapter,
CORBA_Identifier op_name,PortableServer_ServantLocator_Cookie *cookie)
+static PortableServer_Servant
+preinvoke_dataobject (PortableServer_Servant servant,
+ PortableServer_ObjectId * oid,
+ PortableServer_POA adapter, CORBA_Identifier op_name,
+ PortableServer_ServantLocator_Cookie * cookie)
{
- /* TODO: check for existance of the object with the given ID, and return
NULL if not found */
- GEAS_object_reference *id = NULL;
- PortableServer_Servant retval = NULL;
- CORBA_Environment ev;
+ /* TODO: check for existance of the object with the given ID, and return
NULL if not found */
+ GEAS_object_reference *id = NULL;
+ PortableServer_Servant retval = NULL;
+ CORBA_Environment ev;
- CORBA_exception_init(&ev);
+ CORBA_exception_init (&ev);
- id = corba_id_to_geas_reference(oid,&ev);
- if( ev._major != CORBA_NO_EXCEPTION )
- {
- errormsg( CORBA_exception_id(&ev) );
- CORBA_exception_free(&ev);
- return( NULL );
- }
+ id = corba_id_to_geas_reference (oid, &ev);
+ if (ev._major != CORBA_NO_EXCEPTION)
+ {
+ errormsg (CORBA_exception_id (&ev));
+ CORBA_exception_free (&ev);
+ return (NULL);
+ }
- CORBA_exception_free(&ev);
- if( id )
- {
- if( oc_validate_object(id->classname,id->objectid) )
- {
- retval = (PortableServer_Servant)&poa_geas_dataobject_servant;
- }
- else
- {
- Connection_realNewObject(id);
- if( oc_validate_object(id->classname,id->objectid) )
- retval = (PortableServer_Servant)&poa_geas_dataobject_servant;
- }
- free_geas_object_reference( id );
- }
+ CORBA_exception_free (&ev);
+ if (id)
+ {
+ if (oc_validate_object (id->classname, id->objectid))
+ {
+ retval = (PortableServer_Servant) & poa_geas_dataobject_servant;
+ }
+ else
+ {
+ Connection_realNewObject (id);
+ if (oc_validate_object (id->classname, id->objectid))
+ retval = (PortableServer_Servant) & poa_geas_dataobject_servant;
+ }
+ free_geas_object_reference (id);
+ }
- return( retval );
+ return (retval);
}
-static void postinvoke_dataobject (PortableServer_Servant
s,PortableServer_ObjectId *oid,PortableServer_POA adapter, CORBA_Identifier
op_name,PortableServer_ServantLocator_Cookie cookie, PortableServer_Servant
servant)
+static void
+postinvoke_dataobject (PortableServer_Servant s,
+ PortableServer_ObjectId * oid,
+ PortableServer_POA adapter, CORBA_Identifier op_name,
+ PortableServer_ServantLocator_Cookie cookie,
+ PortableServer_Servant servant)
{
}
-static PortableServer_Servant preinvoke_admin (PortableServer_Servant
servant,PortableServer_ObjectId *oid,PortableServer_POA adapter,
CORBA_Identifier op_name,PortableServer_ServantLocator_Cookie *cookie)
+static PortableServer_Servant
+preinvoke_admin (PortableServer_Servant servant,
+ PortableServer_ObjectId * oid, PortableServer_POA adapter,
+ CORBA_Identifier op_name,
+ PortableServer_ServantLocator_Cookie * cookie)
{
- /* Question: should this even exist? :) */
- return( (PortableServer_Servant)&poa_geas_admin_servant );
+ /* Question: should this even exist? :) */
+ return ((PortableServer_Servant) & poa_geas_admin_servant);
}
-static void postinvoke_admin (PortableServer_Servant
s,PortableServer_ObjectId *oid,PortableServer_POA adapter, CORBA_Identifier
op_name,PortableServer_ServantLocator_Cookie cookie, PortableServer_Servant
servant)
+static void
+postinvoke_admin (PortableServer_Servant s, PortableServer_ObjectId * oid,
+ PortableServer_POA adapter, CORBA_Identifier op_name,
+ PortableServer_ServantLocator_Cookie cookie,
+ PortableServer_Servant servant)
{
}
/* pointers to actual ServantLocator instances */
-static PortableServer_ServantManager poa_servantmanager_connection =
CORBA_OBJECT_NIL;
-static PortableServer_ServantManager poa_servantmanager_dataobject =
CORBA_OBJECT_NIL;
-static PortableServer_ServantManager poa_servantmanager_objectlist =
CORBA_OBJECT_NIL;
-static PortableServer_ServantManager poa_servantmanager_admin =
CORBA_OBJECT_NIL;
-static PortableServer_ServantManager poa_servantmanager_transaction =
CORBA_OBJECT_NIL;
-
-static PortableServer_ServantManager poa_servantmanager_constraint =
CORBA_OBJECT_NIL;
-static PortableServer_ServantManager poa_servantmanager_query =
CORBA_OBJECT_NIL;
-
-static POA_PortableServer_ServantLocator__epv connection_epv =
-{
- NULL , /* _private */ (gpointer)&preinvoke_connection,
(gpointer)&postinvoke_connection
-};
-static POA_PortableServer_ServantLocator__epv transaction_epv =
-{
- NULL , /* _private */ (gpointer)&preinvoke_transaction,
(gpointer)&postinvoke_transaction
-};
-static POA_PortableServer_ServantLocator__epv dataobject_epv =
-{
- NULL , /* _private */ (gpointer)&preinvoke_dataobject,
(gpointer)&postinvoke_dataobject
+static PortableServer_ServantManager poa_servantmanager_connection =
+ CORBA_OBJECT_NIL;
+static PortableServer_ServantManager poa_servantmanager_dataobject =
+ CORBA_OBJECT_NIL;
+static PortableServer_ServantManager poa_servantmanager_objectlist =
+ CORBA_OBJECT_NIL;
+static PortableServer_ServantManager poa_servantmanager_admin =
+ CORBA_OBJECT_NIL;
+static PortableServer_ServantManager poa_servantmanager_transaction =
+ CORBA_OBJECT_NIL;
+
+static PortableServer_ServantManager poa_servantmanager_constraint =
+ CORBA_OBJECT_NIL;
+static PortableServer_ServantManager poa_servantmanager_query =
+ CORBA_OBJECT_NIL;
+
+static POA_PortableServer_ServantLocator__epv connection_epv = {
+ NULL, /* _private */ (gpointer) & preinvoke_connection, (gpointer) &
postinvoke_connection
+};
+static POA_PortableServer_ServantLocator__epv transaction_epv = {
+ NULL, /* _private */ (gpointer) & preinvoke_transaction, (gpointer) &
postinvoke_transaction
+};
+static POA_PortableServer_ServantLocator__epv dataobject_epv = {
+ NULL, /* _private */ (gpointer) & preinvoke_dataobject, (gpointer) &
postinvoke_dataobject
+};
+static POA_PortableServer_ServantLocator__epv objectlist_epv = {
+ NULL, /* _private */ (gpointer) & preinvoke_objectlist, (gpointer) &
postinvoke_objectlist
};
-static POA_PortableServer_ServantLocator__epv objectlist_epv =
-{
- NULL , /* _private */ (gpointer)&preinvoke_objectlist,
(gpointer)&postinvoke_objectlist
+static POA_PortableServer_ServantLocator__epv admin_epv = {
+ NULL, /* _private */ (gpointer) & preinvoke_admin, (gpointer) &
postinvoke_admin
};
-static POA_PortableServer_ServantLocator__epv admin_epv =
-{
- NULL , /* _private */ (gpointer)&preinvoke_admin,
(gpointer)&postinvoke_admin
+static POA_PortableServer_ServantLocator__epv query_epv = {
+ NULL, /* _private */ (gpointer) & preinvoke_query, (gpointer) &
postinvoke_query
};
-static POA_PortableServer_ServantLocator__epv query_epv =
-{
- NULL , /* _private */ (gpointer)&preinvoke_query,
(gpointer)&postinvoke_query
+static POA_PortableServer_ServantLocator__epv constraint_epv = {
+ NULL, /* _private */ (gpointer) & preinvoke_constraint, (gpointer) &
postinvoke_constraint
};
-static POA_PortableServer_ServantLocator__epv constraint_epv =
-{
- NULL , /* _private */ (gpointer)&preinvoke_constraint,
(gpointer)&postinvoke_constraint
-};
typedef struct
{
- POA_PortableServer_ServantLocator servant;
- PortableServer_POA poa;
- /* no other object state */
-} impl_POA_PortableServer_ServantLocator;
+ POA_PortableServer_ServantLocator servant;
+ PortableServer_POA poa;
+ /* no other object state */
+}
+impl_POA_PortableServer_ServantLocator;
/* servant locator base */
-PortableServer_ServantBase__epv base_epv =
-{
- NULL, /* _private */
- NULL, /* finalise */
- NULL /* default_POA */
+PortableServer_ServantBase__epv base_epv = {
+ NULL, /* _private */
+ NULL, /* finalise */
+ NULL /* default_POA */
};
/* servant manager, no functions? */
-POA_PortableServer_ServantManager__epv crapthing =
-{ NULL };
+POA_PortableServer_ServantManager__epv crapthing = { NULL };
/* servant locator, needs to be able to find methods */
-static POA_PortableServer_ServantLocator__vepv transaction_vepv =
-{
- &base_epv, &crapthing, &transaction_epv
+static POA_PortableServer_ServantLocator__vepv transaction_vepv = {
+ &base_epv, &crapthing, &transaction_epv
};
-static POA_PortableServer_ServantLocator__vepv connection_vepv =
-{
- &base_epv, &crapthing, &connection_epv
+static POA_PortableServer_ServantLocator__vepv connection_vepv = {
+ &base_epv, &crapthing, &connection_epv
};
-static POA_PortableServer_ServantLocator__vepv dataobject_vepv =
-{
- &base_epv, &crapthing, &dataobject_epv
+static POA_PortableServer_ServantLocator__vepv dataobject_vepv = {
+ &base_epv, &crapthing, &dataobject_epv
};
-static POA_PortableServer_ServantLocator__vepv objectlist_vepv =
-{
- &base_epv, &crapthing, &objectlist_epv
+static POA_PortableServer_ServantLocator__vepv objectlist_vepv = {
+ &base_epv, &crapthing, &objectlist_epv
};
-static POA_PortableServer_ServantLocator__vepv admin_vepv =
-{
- &base_epv, &crapthing, &admin_epv
+static POA_PortableServer_ServantLocator__vepv admin_vepv = {
+ &base_epv, &crapthing, &admin_epv
};
-static POA_PortableServer_ServantLocator__vepv query_vepv =
-{
- &base_epv, &crapthing, &query_epv
+static POA_PortableServer_ServantLocator__vepv query_vepv = {
+ &base_epv, &crapthing, &query_epv
};
-static POA_PortableServer_ServantLocator__vepv constraint_vepv =
-{
- &base_epv, &crapthing, &constraint_epv
+static POA_PortableServer_ServantLocator__vepv constraint_vepv = {
+ &base_epv, &crapthing, &constraint_epv
};
typedef struct
{
- POA_PortableServer_ServantLocator servant;
- PortableServer_POA poa;
-} impl_POA_ServantLocator;
+ POA_PortableServer_ServantLocator servant;
+ PortableServer_POA poa;
+}
+impl_POA_ServantLocator;
/*
static PortableServer_ServantLocator *connection_locator;
static PortableServer_ServantLocator *dataobject_locator;
@@ -267,54 +324,63 @@
static PortableServer_ServantLocator *constraint_locator;
*/
static PortableServer_ServantManager
-create_locator( PortableServer_POA root_poa ,
POA_PortableServer_ServantLocator__vepv *vepv , CORBA_Environment *ev )
-{
- impl_POA_ServantLocator *newservant = NULL;
- PortableServer_ObjectId *objid;
+create_locator (PortableServer_POA root_poa,
+ POA_PortableServer_ServantLocator__vepv * vepv,
+ CORBA_Environment * ev)
+{
+ impl_POA_ServantLocator *newservant = NULL;
+ PortableServer_ObjectId *objid;
+
+ newservant = g_new0 (impl_POA_ServantLocator, 1);
+ newservant->servant.vepv = vepv;
+ POA_PortableServer_ServantLocator__init ((PortableServer_Servant)
+ newservant, ev);
+ objid = PortableServer_POA_activate_object (root_poa, newservant, ev);
+ /* printf( "locator objectid: %s\n" ,
PortableServer_ObjectId_to_string(objid,ev) ); */
+ CORBA_free (objid);
- newservant = g_new0(impl_POA_ServantLocator,1);
- newservant->servant.vepv = vepv;
- POA_PortableServer_ServantLocator__init( (PortableServer_Servant)newservant
, ev );
- objid = PortableServer_POA_activate_object(root_poa, newservant, ev);
- /* printf( "locator objectid: %s\n" ,
PortableServer_ObjectId_to_string(objid,ev) ); */
- CORBA_free(objid);
-
- return( (PortableServer_ServantManager)newservant );
+ return ((PortableServer_ServantManager) newservant);
}
-
+
void
-create_fake_servants( PortableServer_POA root_poa , CORBA_Environment *ev )
+create_fake_servants (PortableServer_POA root_poa, CORBA_Environment * ev)
{
- message( "Creating locator objects" );
+ message ("Creating locator objects");
- /* Transaction */
- poa_servantmanager_transaction = create_locator( root_poa ,
&transaction_vepv , ev );
+ /* Transaction */
+ poa_servantmanager_transaction =
+ create_locator (root_poa, &transaction_vepv, ev);
- /* Connection */
- poa_servantmanager_connection = create_locator( root_poa , &connection_vepv
, ev );
+ /* Connection */
+ poa_servantmanager_connection =
+ create_locator (root_poa, &connection_vepv, ev);
- /* Data Object */
- poa_servantmanager_dataobject = create_locator( root_poa , &dataobject_vepv
, ev );
+ /* Data Object */
+ poa_servantmanager_dataobject =
+ create_locator (root_poa, &dataobject_vepv, ev);
- /* Object List */
- poa_servantmanager_objectlist = create_locator( root_poa , &objectlist_vepv
, ev );
+ /* Object List */
+ poa_servantmanager_objectlist =
+ create_locator (root_poa, &objectlist_vepv, ev);
- /* Admin */
- poa_servantmanager_admin = create_locator( root_poa , &admin_vepv , ev );
+ /* Admin */
+ poa_servantmanager_admin = create_locator (root_poa, &admin_vepv, ev);
- /* Query */
- poa_servantmanager_query = create_locator( root_poa , &query_vepv , ev );
+ /* Query */
+ poa_servantmanager_query = create_locator (root_poa, &query_vepv, ev);
- /* Constraint */
- poa_servantmanager_constraint = create_locator( root_poa , &constraint_vepv
, ev );
+ /* Constraint */
+ poa_servantmanager_constraint =
+ create_locator (root_poa, &constraint_vepv, ev);
}
-void free_fake_servants(void )
+void
+free_fake_servants (void)
{
- /* TODO: */
+ /* TODO: */
- /* remove locator objects */
+ /* remove locator objects */
- /* remove fake servants */
+ /* remove fake servants */
}
Index: gnue/geas/src/transaction.h
diff -u gnue/geas/src/transaction.h:1.2 gnue/geas/src/transaction.h:1.3
--- gnue/geas/src/transaction.h:1.2 Thu Feb 8 15:21:42 2001
+++ gnue/geas/src/transaction.h Sun Jun 10 05:56:12 2001
@@ -1,5 +1,7 @@
/*
- geas - GNU Enterprise Application Server
+ transaction.h
+
+ Part of GNU Enterprise Application Server (GEAS)
Copyright (C) 2001 Free Software Foundation
@@ -16,6 +18,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ $Id: transaction.h,v 1.3 2001/06/10 12:56:12 ntiffin Exp $
*/
@@ -24,20 +28,22 @@
/* factory methods */
GEAS_Transaction
-TransactionFactory_new( GEAS_object_reference *id , CORBA_Environment *ev );
+TransactionFactory_new (GEAS_object_reference * id, CORBA_Environment * ev);
GEAS_Transaction
-TransactionFactory_current( GEAS_object_reference *id , CORBA_Environment *ev
);
+TransactionFactory_current (GEAS_object_reference * id,
+ CORBA_Environment * ev);
/* transaction methods */
-void Transaction_begin( GEAS_object_reference *id , CORBA_Environment *ev );
-void Transaction_commit( GEAS_object_reference *id , CORBA_Environment *ev );
-void Transaction_abort( GEAS_object_reference *id , CORBA_Environment *ev );
-void Transaction_checkpoint( GEAS_object_reference *id , CORBA_Environment *ev
);
-void Transaction_join( GEAS_object_reference *id , CORBA_Environment *ev );
-void Transaction_leave( GEAS_object_reference *id , CORBA_Environment *ev );
-CORBA_boolean Transaction_isOpen( GEAS_object_reference *id ,
CORBA_Environment *ev );
+void Transaction_begin (GEAS_object_reference * id, CORBA_Environment * ev);
+void Transaction_commit (GEAS_object_reference * id, CORBA_Environment * ev);
+void Transaction_abort (GEAS_object_reference * id, CORBA_Environment * ev);
+void Transaction_checkpoint (GEAS_object_reference * id,
+ CORBA_Environment * ev);
+void Transaction_join (GEAS_object_reference * id, CORBA_Environment * ev);
+void Transaction_leave (GEAS_object_reference * id, CORBA_Environment * ev);
+CORBA_boolean Transaction_isOpen (GEAS_object_reference * id,
+ CORBA_Environment * ev);
#endif /* TRANSACTION_H */
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/geas/src dataobject.h exceptions.h factory...,
Neil Tiffin <=