From dde2d0a9d731cc22357f029690941b87d423b151 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Posp=C3=AD=C5=A1il?= Date: Sat, 11 Aug 2007 17:56:01 +0000 Subject: [PATCH] use org.glite.jobid.api-c[pp] instead of org.glite.wmsutils.jobid (more) --- org.glite.lb.logger/src/event_queue.c | 2 +- org.glite.lb.logger/src/il_master.c | 2 +- org.glite.lb.logger/src/queue_mgr.c | 2 +- org.glite.lb.logger/src/send_event.c | 2 +- org.glite.lb.proxy/src/fake_write2rgma.c | 1 - org.glite.lb.server/interface/query.h | 1 + org.glite.lb.server/src/bkserverd.c | 5 +++-- org.glite.lb.server/src/dump.c | 2 +- org.glite.lb.server/src/jobstat_supp.c | 2 +- org.glite.lb.server/src/lb_authz.c | 4 ++-- org.glite.lb.server/src/lb_proto.c | 2 +- org.glite.lb.server/src/lb_xml_parse.c.T | 2 +- org.glite.lb.server/src/lb_xml_parse_V21.c.T | 2 +- org.glite.lb.server/src/lock.c | 2 +- org.glite.lb.server/src/srv_purge.c | 2 +- org.glite.lb.server/src/userjobs.c | 4 ++-- 16 files changed, 19 insertions(+), 18 deletions(-) diff --git a/org.glite.lb.logger/src/event_queue.c b/org.glite.lb.logger/src/event_queue.c index bc9a44e..3851b71 100644 --- a/org.glite.lb.logger/src/event_queue.c +++ b/org.glite.lb.logger/src/event_queue.c @@ -12,7 +12,7 @@ #include #include -#include "glite/wmsutils/jobid/cjobid.h" +#include "glite/jobid/cjobid.h" #include "interlogd.h" diff --git a/org.glite.lb.logger/src/il_master.c b/org.glite.lb.logger/src/il_master.c index ea4f97e..3905eb0 100644 --- a/org.glite.lb.logger/src/il_master.c +++ b/org.glite.lb.logger/src/il_master.c @@ -4,7 +4,7 @@ #include #include -#include "glite/wmsutils/jobid/cjobid.h" +#include "glite/jobid/cjobid.h" #include "glite/lb/context.h" #include "glite/lb/events_parse.h" #include "glite/lb/il_string.h" diff --git a/org.glite.lb.logger/src/queue_mgr.c b/org.glite.lb.logger/src/queue_mgr.c index c973a38..ba01aec 100644 --- a/org.glite.lb.logger/src/queue_mgr.c +++ b/org.glite.lb.logger/src/queue_mgr.c @@ -4,7 +4,7 @@ #include #include -#include "glite/wmsutils/jobid/cjobid.h" +#include "glite/jobid/cjobid.h" #include "glite/lb/context.h" #include "interlogd.h" diff --git a/org.glite.lb.logger/src/send_event.c b/org.glite.lb.logger/src/send_event.c index c9833a4..ae00a5b 100644 --- a/org.glite.lb.logger/src/send_event.c +++ b/org.glite.lb.logger/src/send_event.c @@ -15,7 +15,7 @@ * - L/B server protocol handling routines */ -#include "glite/wmsutils/jobid/cjobid.h" +#include "glite/jobid/cjobid.h" #include "glite/lb/il_string.h" #include "glite/lb/context.h" diff --git a/org.glite.lb.proxy/src/fake_write2rgma.c b/org.glite.lb.proxy/src/fake_write2rgma.c index c0c3c96..4f49a05 100755 --- a/org.glite.lb.proxy/src/fake_write2rgma.c +++ b/org.glite.lb.proxy/src/fake_write2rgma.c @@ -2,7 +2,6 @@ #include -#include "glite/wmsutils/jobid/cjobid.h" #include "glite/lb/jobstat.h" char* write2rgma_statline(edg_wll_JobStat *stat) diff --git a/org.glite.lb.server/interface/query.h b/org.glite.lb.server/interface/query.h index 9c9ba07..4afaa4e 100644 --- a/org.glite.lb.server/interface/query.h +++ b/org.glite.lb.server/interface/query.h @@ -3,6 +3,7 @@ #ident "$Header$" +#include "glite/jobid/cjobid.h" #include "glite/lb/context.h" #include "glite/lb/events.h" #include "glite/lb/jobstat.h" diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c index 10ba66f..5a5caaa 100644 --- a/org.glite.lb.server/src/bkserverd.c +++ b/org.glite.lb.server/src/bkserverd.c @@ -34,6 +34,7 @@ #include "glite/security/glite_gsplugin.h" #endif /* GLITE_LB_SERVER_WITH_WS */ +#include "glite/jobid/cjobid.h" #include "glite/security/glite_gss.h" #include "glite/lb/srvbones.h" #include "glite/lb/context.h" @@ -326,9 +327,9 @@ int main(int argc, char *argv[]) name = strrchr(argv[0],'/'); if (name) name++; else name = argv[0]; - asprintf(&port, "%d", GLITE_WMSC_JOBID_DEFAULT_PORT); + asprintf(&port, "%d", GLITE_JOBID_DEFAULT_PORT); #ifdef GLITE_LB_SERVER_WITH_WS - asprintf(&ws_port, "%d", GLITE_WMSC_JOBID_DEFAULT_PORT+3); + asprintf(&ws_port, "%d", GLITE_JOBID_DEFAULT_PORT+3); #endif /* GLITE_LB_SERVER_WITH_WS */ server_cert = server_key = cadir = vomsdir = NULL; diff --git a/org.glite.lb.server/src/dump.c b/org.glite.lb.server/src/dump.c index 431b6af..09b689f 100644 --- a/org.glite.lb.server/src/dump.c +++ b/org.glite.lb.server/src/dump.c @@ -9,7 +9,7 @@ #include #include "glite/lb/trio.h" -#include "glite/wmsutils/jobid/cjobid.h" +#include "glite/jobid/cjobid.h" #include "glite/lb/context-int.h" #include "glite/lb/events_parse.h" diff --git a/org.glite.lb.server/src/jobstat_supp.c b/org.glite.lb.server/src/jobstat_supp.c index 2f24fef..a8ee25b 100644 --- a/org.glite.lb.server/src/jobstat_supp.c +++ b/org.glite.lb.server/src/jobstat_supp.c @@ -10,7 +10,7 @@ #include #include -#include "glite/wmsutils/jobid/cjobid.h" +#include "glite/jobid/cjobid.h" #include "glite/lb/context-int.h" #include "glite/lb/trio.h" diff --git a/org.glite.lb.server/src/lb_authz.c b/org.glite.lb.server/src/lb_authz.c index 752ecf5..7cba754 100644 --- a/org.glite.lb.server/src/lb_authz.c +++ b/org.glite.lb.server/src/lb_authz.c @@ -14,8 +14,8 @@ #undef WITHOUT_TRIO #include "glite/security/voms/voms_apic.h" -#include "glite/wmsutils/jobid/strmd5.h" -#include "glite/wmsutils/jobid/cjobid.h" +#include "glite/jobid/strmd5.h" +#include "glite/jobid/cjobid.h" #include "glite/lb/trio.h" #include "lbs_db.h" diff --git a/org.glite.lb.server/src/lb_proto.c b/org.glite.lb.server/src/lb_proto.c index 8428f3c..b4ca287 100644 --- a/org.glite.lb.server/src/lb_proto.c +++ b/org.glite.lb.server/src/lb_proto.c @@ -466,7 +466,7 @@ edg_wll_ErrorCode edg_wll_Proto(edg_wll_Context ctx, for (pom1=pomCopy; *pom1 && !isspace(*pom1); pom1++); *pom1 = 0; - asprintf(&fullid,GLITE_WMSC_JOBID_PROTO_PREFIX"%s:%u/%s",ctx->srvName,ctx->srvPort,pomCopy); + asprintf(&fullid,GLITE_JOBID_PROTO_PREFIX"%s:%u/%s",ctx->srvName,ctx->srvPort,pomCopy); free(pomCopy); if (edg_wlc_JobIdParse(fullid, &jobId)) { diff --git a/org.glite.lb.server/src/lb_xml_parse.c.T b/org.glite.lb.server/src/lb_xml_parse.c.T index 14c4a0e..76c755d 100644 --- a/org.glite.lb.server/src/lb_xml_parse.c.T +++ b/org.glite.lb.server/src/lb_xml_parse.c.T @@ -6,7 +6,7 @@ #include #include -#include "glite/wmsutils/jobid/cjobid.h" +#include "glite/jobid/cjobid.h" #include "glite/lb/escape.h" #include "glite/lb/context-int.h" diff --git a/org.glite.lb.server/src/lb_xml_parse_V21.c.T b/org.glite.lb.server/src/lb_xml_parse_V21.c.T index 1d351d5..4ffb499 100644 --- a/org.glite.lb.server/src/lb_xml_parse_V21.c.T +++ b/org.glite.lb.server/src/lb_xml_parse_V21.c.T @@ -6,7 +6,7 @@ #include #include -#include "glite/wmsutils/jobid/cjobid.h" +#include "glite/jobid/cjobid.h" #include "glite/lb/escape.h" #include "glite/lb/context-int.h" diff --git a/org.glite.lb.server/src/lock.c b/org.glite.lb.server/src/lock.c index de75dd9..2af114e 100644 --- a/org.glite.lb.server/src/lock.c +++ b/org.glite.lb.server/src/lock.c @@ -6,7 +6,7 @@ #include #include -#include "glite/wmsutils/jobid/cjobid.h" +#include "glite/jobid/cjobid.h" #include "glite/lb/context-int.h" #include "lock.h" diff --git a/org.glite.lb.server/src/srv_purge.c b/org.glite.lb.server/src/srv_purge.c index 434545c..1369f30 100644 --- a/org.glite.lb.server/src/srv_purge.c +++ b/org.glite.lb.server/src/srv_purge.c @@ -10,7 +10,7 @@ #include #include -#include "glite/wmsutils/jobid/cjobid.h" +#include "glite/jobid/cjobid.h" #include "glite/lb/trio.h" #include "glite/lb/context-int.h" diff --git a/org.glite.lb.server/src/userjobs.c b/org.glite.lb.server/src/userjobs.c index e90043a..cbc7c0f 100644 --- a/org.glite.lb.server/src/userjobs.c +++ b/org.glite.lb.server/src/userjobs.c @@ -5,8 +5,8 @@ #include #include -#include "glite/wmsutils/jobid/cjobid.h" -#include "glite/wmsutils/jobid/strmd5.h" +#include "glite/jobid/cjobid.h" +#include "glite/jobid/strmd5.h" #include "glite/lb/context-int.h" #include "glite/lb/trio.h" -- 1.8.2.3