use org.glite.jobid.api-c[pp] instead of org.glite.wmsutils.jobid

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 517c0a8..a753989 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -15,7 +15,7 @@ expat_prefix=/opt/expat
 -include Makefile.inc
 -include ../project/version.properties
 
-jobiddir=${top_srcdir}/../org.glite.wms-utils.jobid
+jobiddir=${top_srcdir}/../org.glite.jobid.api-c
 
 version=${module.version}
 
@@ -32,7 +32,7 @@ ifdef LB_STANDALONE
        JOBID_OBJS:=cjobid.o strmd5.o
        LB_STANDALONE_FLAGS:=-DLB_STANDALONE
 else
-       JOBID_LIB:=-lglite_wmsutils_cjobid
+       JOBID_LIB:=-lglite_jobid
 endif
 
 PERF_HDRS:=lb_perftest.h
@@ -203,10 +203,10 @@ distbin:
 
 cjobid.c strmd5.c:
        if [ ! -d ${jobiddir} ]; then echo "Directory ${jobiddir} not found"; exit 1; fi
-       mkdir -p glite/wmsutils/jobid
+       mkdir -p glite/jobid
        rm -f jobid && ln -fs . jobid
-       cp -rv ${jobiddir}/interface/glite/wmsutils/jobid/cjobid.h glite/wmsutils/jobid/
-       cp -rv ${jobiddir}/src/jobid/*.h glite/wmsutils/jobid/
+       cp -rv ${jobiddir}/interface/cjobid.h glite/jobid/
+       cp -rv ${jobiddir}/src/jobid/*.h glite/jobid/
        cp -rv ${jobiddir}/src/jobid/*.[ch] .
 
 doc: events.tex status.tex

diff --git a/org.glite.lb.common/interface/Event.h.T b/org.glite.lb.common/interface/Event.h.T
index db4c13f..cde00b6 100644 (file)
--- a/org.glite.lb.common/interface/Event.h.T
+++ b/org.glite.lb.common/interface/Event.h.T
@@ -17,7 +17,7 @@
 #include <vector>
 #include <string>
 
-#include "glite/wmsutils/jobid/JobId.h"
+#include "glite/jobid/JobId.h"
 #include "glite/lb/CountRef.h"
 
 #include "glite/lb/events.h"
@@ -237,7 +237,7 @@ public:
         * \throw Exception Invalid event type or attribute not
         * defined for this event.
         */
-        const glite::wmsutils::jobid::JobId getValJobId(Attr name) const;
+        const glite::jobid::JobId getValJobId(Attr name) const;
 
        /** Attribute name.
         *

diff --git a/org.glite.lb.common/interface/context.h b/org.glite.lb.common/interface/context.h
index 41ac6cb..2b6fce4 100644 (file)
--- a/org.glite.lb.common/interface/context.h
+++ b/org.glite.lb.common/interface/context.h
@@ -9,7 +9,7 @@
 #ifndef LB_STANDALONE
 #include "glite/wmsutils/exception/exception_codes.h"
 #endif
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 
 #ident "$Header$"
 

diff --git a/org.glite.lb.common/interface/lb_perftest.h b/org.glite.lb.common/interface/lb_perftest.h
index eb6c748..763e723 100644 (file)
--- a/org.glite.lb.common/interface/lb_perftest.h
+++ b/org.glite.lb.common/interface/lb_perftest.h
@@ -3,8 +3,8 @@
 
 #ident "$Header$"
 
-#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/events.h"
 
 #define PERFTEST_END_TAG_NAME "lb_perftest"

diff --git a/org.glite.lb.common/interface/query_rec.h b/org.glite.lb.common/interface/query_rec.h
index debce8c..f86edb5 100644 (file)
--- a/org.glite.lb.common/interface/query_rec.h
+++ b/org.glite.lb.common/interface/query_rec.h
@@ -8,7 +8,7 @@
 
 #ident "$Header$"
 
-#include "glite/wmsutils/jobid/cjobid.h"
+#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.common/interface/xml_conversions.h b/org.glite.lb.common/interface/xml_conversions.h
index 45ac500..8a62e8c 100644 (file)
--- a/org.glite.lb.common/interface/xml_conversions.h
+++ b/org.glite.lb.common/interface/xml_conversions.h
@@ -3,7 +3,7 @@
 
 #ident "$Header$"
 
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #include "glite/lb/events.h"
 #include "glite/lb/query_rec.h"
 #include "glite/lb/notifid.h"

diff --git a/org.glite.lb.common/interface/xml_parse.h b/org.glite.lb.common/interface/xml_parse.h
index 038dd67..38f7519 100644 (file)
--- a/org.glite.lb.common/interface/xml_parse.h
+++ b/org.glite.lb.common/interface/xml_parse.h
@@ -3,7 +3,7 @@
 
 #ident "$Header$"
 
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #include "glite/lb/events.h"
 #include "glite/lb/context.h"
 #include "glite/lb/query_rec.h"

diff --git a/org.glite.lb.common/src/context.c b/org.glite.lb.common/src/context.c
index ecda2a1..5b42b8e 100644 (file)
--- a/org.glite.lb.common/src/context.c
+++ b/org.glite.lb.common/src/context.c
@@ -6,8 +6,8 @@
 #include <errno.h>
 #include <assert.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/context-int.h"
 // #include "glite/lb/producer.h"
 

diff --git a/org.glite.lb.common/src/lb_perftest.c b/org.glite.lb.common/src/lb_perftest.c
index 078c52c..93f35d0 100644 (file)
--- a/org.glite.lb.common/src/lb_perftest.c
+++ b/org.glite.lb.common/src/lb_perftest.c
@@ -206,7 +206,7 @@ glite_wll_perftest_init(const char *host,
                        *p++ = ':';
                        dest_port = atoi(p);
                } else 
-                       dest_port = GLITE_WMSC_JOBID_DEFAULT_PORT;
+                       dest_port = GLITE_JOBID_DEFAULT_PORT;
        }
 
        /* reset event source */

diff --git a/org.glite.lb.common/src/notifid.c b/org.glite.lb.common/src/notifid.c
index ee3c162..1d26d3d 100644 (file)
--- a/org.glite.lb.common/src/notifid.c
+++ b/org.glite.lb.common/src/notifid.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #include "glite/lb/notifid.h"
 
 int edg_wll_NotifIdParse(const char *s,edg_wll_NotifId *n)

diff --git a/org.glite.lb.common/src/param.c b/org.glite.lb.common/src/param.c
index 3decef6..8c804d2 100644 (file)
--- a/org.glite.lb.common/src/param.c
+++ b/org.glite.lb.common/src/param.c
@@ -4,7 +4,7 @@
 #include <sys/time.h>
 #include <errno.h>
 
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #include "glite/lb/context-int.h"
 // XXX:
 #include "glite/lb/log_proto.h" // for default log host and port
@@ -202,7 +202,7 @@ int edg_wll_SetParamInt(edg_wll_Context ctx,edg_wll_ContextParam param,int val)
                        break;
                case EDG_WLL_PARAM_QUERY_SERVER_PORT:
                        ctx->p_query_server_port = val ? val :
-                               extract_port(param,GLITE_WMSC_JOBID_DEFAULT_PORT);;
+                               extract_port(param,GLITE_JOBID_DEFAULT_PORT);;
                        break;
                case EDG_WLL_PARAM_NOTIF_SERVER_PORT:
                        ctx->p_notif_server_port = val ? val :

diff --git a/org.glite.lb.common/src/query_rec.c b/org.glite.lb.common/src/query_rec.c
index cc0598d..9317f73 100644 (file)
--- a/org.glite.lb.common/src/query_rec.c
+++ b/org.glite.lb.common/src/query_rec.c
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #include "glite/lb/query_rec.h"
 
 /*