the first round of removal of globus dependencies

- removed activations of globus modules and unused headers
- edg_wll_gss_gethostname() used instead of globus_libc_gethostname()

diff --git a/org.glite.lb.client/src/consumer.c b/org.glite.lb.client/src/consumer.c
index 916cb0a..9a9a788 100644 (file)
--- a/org.glite.lb.client/src/consumer.c
+++ b/org.glite.lb.client/src/consumer.c
@@ -9,8 +9,6 @@
 
 #include <expat.h>
 
-#include "globus_config.h"
-
 #include "glite/lb/context-int.h"
 #include "glite/lb/mini_http.h"
 #include "glite/lb/xml_parse.h"

diff --git a/org.glite.lb.client/src/logevent.c.T b/org.glite.lb.client/src/logevent.c.T
index 1f7bff8..80588a4 100644 (file)
--- a/org.glite.lb.client/src/logevent.c.T
+++ b/org.glite.lb.client/src/logevent.c.T
@@ -13,8 +13,6 @@
 #include <math.h> // log
 #include <ctype.h> // isspace
 
-#include <globus_common.h>
-
 #include "glite/security/glite_gss.h"
 #include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/lb/notifid.h"

diff --git a/org.glite.lb.common/src/context.c b/org.glite.lb.common/src/context.c
index 0b156c1..8874152 100644 (file)
--- a/org.glite.lb.common/src/context.c
+++ b/org.glite.lb.common/src/context.c
@@ -6,8 +6,6 @@
 #include <errno.h>
 #include <assert.h>
 
-#include <globus_config.h>
-
 #include "glite/wmsutils/jobid/strmd5.h"
 #include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/lb/context-int.h"

diff --git a/org.glite.lb.common/src/mini_http.c b/org.glite.lb.common/src/mini_http.c
index a3381e2..d591ea0 100644 (file)
--- a/org.glite.lb.common/src/mini_http.c
+++ b/org.glite.lb.common/src/mini_http.c
@@ -12,8 +12,6 @@
 
 #include "glite/security/glite_gss.h"
 
-#include "globus_config.h"
-
 #include "glite/lb/mini_http.h"
 #include "glite/lb/lb_plain_io.h"
 #include "glite/lb/context-int.h"

diff --git a/org.glite.lb.common/src/param.c b/org.glite.lb.common/src/param.c
index 35ace18..3decef6 100644 (file)
--- a/org.glite.lb.common/src/param.c
+++ b/org.glite.lb.common/src/param.c
@@ -4,8 +4,6 @@
 #include <sys/time.h>
 #include <errno.h>
 
-#include <globus_common.h>
-
 #include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/lb/context-int.h"
 // XXX:
@@ -128,7 +126,7 @@ int edg_wll_SetParamString(edg_wll_Context ctx,edg_wll_ContextParam param,const
 
        switch (param) {
                case EDG_WLL_PARAM_HOST:             
-                       globus_libc_gethostname(hn,sizeof hn);
+                       edg_wll_gss_gethostname(hn,sizeof hn);
                        free(ctx->p_host);
                        ctx->p_host = val ? strdup(val) : extract_host(param,hn);
                        break;

diff --git a/org.glite.lb.common/src/xml_parse.c.T b/org.glite.lb.common/src/xml_parse.c.T
index 30cd743..0b7615c 100644 (file)
--- a/org.glite.lb.common/src/xml_parse.c.T
+++ b/org.glite.lb.common/src/xml_parse.c.T
@@ -7,8 +7,6 @@
 
 #include <expat.h>     // Expat header file
 
-#include "globus_config.h"
-
 #include "glite/lb/trio.h"
 #include "glite/wmsutils/jobid/cjobid.h"
 

diff --git a/org.glite.lb.logger/src/interlogd.c b/org.glite.lb.logger/src/interlogd.c
index 260f313..bcb8b85 100644 (file)
--- a/org.glite.lb.logger/src/interlogd.c
+++ b/org.glite.lb.logger/src/interlogd.c
@@ -9,8 +9,6 @@
 #include <signal.h>
 #include <pthread.h>
 
-#include <globus_common.h>
-
 #include "interlogd.h"
 #include "glite/lb/log_proto.h"
 #include "glite/security/glite_gss.h"
@@ -340,11 +338,6 @@ main (int argc, char **argv)
     exit(EXIT_FAILURE);
   }
 
-  if (globus_module_activate(GLOBUS_COMMON_MODULE) != GLOBUS_SUCCESS)  {
-       il_log(LOG_CRIT, "Failed to initialize Globus common module\n");
-       exit(EXIT_FAILURE);
-  }
-
 #ifndef PERF_EMPTY
   /* find all unsent events waiting in files */
 #ifdef LB_PERF

diff --git a/org.glite.lb.logger/src/logd.c b/org.glite.lb.logger/src/logd.c
index 0b8adf7..219cefd 100644 (file)
--- a/org.glite.lb.logger/src/logd.c
+++ b/org.glite.lb.logger/src/logd.c
@@ -12,8 +12,6 @@
 #include <string.h>
 #include <getopt.h>
 
-#include <globus_common.h>
-
 #include "glite/lb/context-int.h"
 #include "glite/lb/timeouts.h"
 #include "logd_proto.h"
@@ -373,18 +371,6 @@ This is LocalLogger, part of Workload Management System in EU DataGrid & EGEE.\n
    if (CAcert_dir)
        setenv("X509_CERT_DIR", CAcert_dir, 1);
 
-   /* initialize Globus common module */
-/* XXX: obsolete?
-   edg_wll_ll_log(LOG_INFO,"Initializing Globus common module...");
-   if (globus_module_activate(GLOBUS_COMMON_MODULE) != GLOBUS_SUCCESS) {
-       edg_wll_ll_log(LOG_NOTICE,"no.\n");
-       edg_wll_ll_log(LOG_CRIT, "Failed to initialize Globus common module. Exiting.\n");
-       exit(1);
-   } else {
-       edg_wll_ll_log(LOG_INFO,"yes.\n");
-   }
-*/
-
    /* initialize signal handling */
    if (mysignal(SIGUSR1, handle_signal) == SIG_ERR) { perror("signal"); exit(1); }
    if (mysignal(SIGUSR2, handle_signal) == SIG_ERR) { perror("signal"); exit(1); }

diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c
index 69b253c..57871c8 100644 (file)
--- a/org.glite.lb.server/src/bkserverd.c
+++ b/org.glite.lb.server/src/bkserverd.c
@@ -27,8 +27,6 @@
 #include <sys/ipc.h>
 #include <sys/sem.h>
 
-#include <globus_common.h>
-
 #ifdef GLITE_LB_SERVER_WITH_WS
 #include "soap_version.h"
 #include <stdsoap2.h>
@@ -479,13 +477,7 @@ int main(int argc, char *argv[])
        {
                char    buf[300];
 
-               if ( globus_module_activate(GLOBUS_COMMON_MODULE) != GLOBUS_SUCCESS )
-               {
-                       dprintf(("[%d]: Unable to initialize Globus common module\n",getpid()));
-                       if (!debug) syslog(LOG_CRIT,"Unable to initialize Globus common module\n");
-               }
-
-               globus_libc_gethostname(buf,sizeof buf);
+               edg_wll_gss_gethostname(buf,sizeof buf);
                buf[sizeof buf - 1] = 0;
                fake_host = strdup(buf);
                fake_port = atoi(port); 

diff --git a/org.glite.lb.server/src/store.c.T b/org.glite.lb.server/src/store.c.T
index 03cbf84..151cb6e 100644 (file)
--- a/org.glite.lb.server/src/store.c.T
+++ b/org.glite.lb.server/src/store.c.T
@@ -17,8 +17,6 @@
 #include <errno.h>
 #include <syslog.h>
 
-#include <globus_config.h>
-
 #include "glite/wmsutils/jobid/strmd5.h"
 
 #include "glite/lb/events_parse.h"

diff --git a/org.glite.lb.utils/src/dump.c b/org.glite.lb.utils/src/dump.c
index ab9417f..4e22639 100644 (file)
--- a/org.glite.lb.utils/src/dump.c
+++ b/org.glite.lb.utils/src/dump.c
@@ -8,8 +8,6 @@
 #include <time.h>
 #include <errno.h>
 
-#include <globus_common.h>
-
 #define CLIENT_SBIN_PROG
 
 #include "glite/lb/context-int.h"
@@ -89,15 +87,6 @@ int main(int argc,char *argv[])
                }
        }
 
-       /* Initialize Globus common module */
-       dprintf(("Initializing Globus common module..."));
-       if (globus_module_activate(GLOBUS_COMMON_MODULE) != GLOBUS_SUCCESS) {
-               dprintf(("no.\n"));
-               fprintf(stderr,"Unable to initialize Globus common module\n");
-       } else {
-               dprintf(("yes.\n"));
-       }
-
        /* check request */
        if (debug) {
                printf("Dump request:\n");

diff --git a/org.glite.lb.utils/src/load.c b/org.glite.lb.utils/src/load.c
index e5c5b8c..3657a47 100644 (file)
--- a/org.glite.lb.utils/src/load.c
+++ b/org.glite.lb.utils/src/load.c
@@ -8,8 +8,6 @@
 #include <time.h>
 #include <errno.h>
 
-#include <globus_common.h>
-
 #define CLIENT_SBIN_PROG
 
 #include "glite/lb/context-int.h"
@@ -85,15 +83,6 @@ int main(int argc,char *argv[])
                }
        }
 
-       /* Initialize Globus common module */
-       dprintf(("Initializing Globus common module..."));
-       if (globus_module_activate(GLOBUS_COMMON_MODULE) != GLOBUS_SUCCESS) {
-               dprintf(("no.\n"));
-               fprintf(stderr,"Unable to initialize Globus common module\n");
-       } else {
-               dprintf(("yes.\n"));
-       }
-
        /* initialize context */
        edg_wll_InitContext(&ctx);
        if ( server )

diff --git a/org.glite.lb.utils/src/purge.c b/org.glite.lb.utils/src/purge.c
index 76ce637..605f4ec 100644 (file)
--- a/org.glite.lb.utils/src/purge.c
+++ b/org.glite.lb.utils/src/purge.c
@@ -8,8 +8,6 @@
 #include <time.h>
 #include <errno.h>
 
-#include <globus_common.h>
-
 #define CLIENT_SBIN_PROG
 
 #include "glite/lb/context-int.h"
@@ -163,15 +161,6 @@ int main(int argc,char *argv[])
                }
        }
 
-       /* Initialize Globus common module */
-       dprintf(("Initializing Globus common module..."));
-       if (globus_module_activate(GLOBUS_COMMON_MODULE) != GLOBUS_SUCCESS) {
-               dprintf(("no.\n"));
-               fprintf(stderr,"Unable to initialize Globus common module\n");
-       } else {
-               dprintf(("yes.\n"));
-       }
-
        /* initialize context */
        edg_wll_InitContext(&ctx);