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

diff --git a/org.glite.lb.client/examples/abort_job.c b/org.glite.lb.client/examples/abort_job.c
index 9b3067b..5d42b6e 100644 (file)
--- a/org.glite.lb.client/examples/abort_job.c
+++ b/org.glite.lb.client/examples/abort_job.c
@@ -11,7 +11,7 @@
 
 #include "glite/lb/events_parse.h"
 #include "consumer.h"
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 
 static void free_events(edg_wll_Event *);
 

diff --git a/org.glite.lb.client/examples/change_acl.c b/org.glite.lb.client/examples/change_acl.c
index f14309f..feb4ba4 100644 (file)
--- a/org.glite.lb.client/examples/change_acl.c
+++ b/org.glite.lb.client/examples/change_acl.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #include "producer.h"
 #include "glite/lb/authz.h"
 

diff --git a/org.glite.lb.client/examples/dagids.c b/org.glite.lb.client/examples/dagids.c
index 7322aa9..a710148 100644 (file)
--- a/org.glite.lb.client/examples/dagids.c
+++ b/org.glite.lb.client/examples/dagids.c
@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #include "producer.h"
 #include "glite/lb/events.h"
 

diff --git a/org.glite.lb.client/examples/flood_proxy.c b/org.glite.lb.client/examples/flood_proxy.c
index a237c18..9f2a3aa 100644 (file)
--- a/org.glite.lb.client/examples/flood_proxy.c
+++ b/org.glite.lb.client/examples/flood_proxy.c
@@ -8,7 +8,7 @@
 #include <sys/wait.h>
 
 #include "producer.h"
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 
 static void slave();
 

diff --git a/org.glite.lb.client/examples/job_log.c b/org.glite.lb.client/examples/job_log.c
index f706787..b095bbc 100644 (file)
--- a/org.glite.lb.client/examples/job_log.c
+++ b/org.glite.lb.client/examples/job_log.c
@@ -11,7 +11,7 @@
 
 #include "glite/lb/events_parse.h"
 #include "consumer.h"
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #ifdef USE_CALLBACKS
   #include "glite/lb/consumer_fake.h"
 #endif

diff --git a/org.glite.lb.client/examples/job_reg.c b/org.glite.lb.client/examples/job_reg.c
index 1df51f8..efb39e4 100644 (file)
--- a/org.glite.lb.client/examples/job_reg.c
+++ b/org.glite.lb.client/examples/job_reg.c
@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #include "producer.h"
 #include "glite/lb/events.h"
 

diff --git a/org.glite.lb.client/examples/log_usertag_proxy.c b/org.glite.lb.client/examples/log_usertag_proxy.c
index 0bafaa0..337ad56 100644 (file)
--- a/org.glite.lb.client/examples/log_usertag_proxy.c
+++ b/org.glite.lb.client/examples/log_usertag_proxy.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #include "glite/lb/notifid.h"
 #include "glite/lb/events.h"
 

diff --git a/org.glite.lb.client/examples/query_ext.c b/org.glite.lb.client/examples/query_ext.c
index aff09cf..f4081b8 100644 (file)
--- a/org.glite.lb.client/examples/query_ext.c
+++ b/org.glite.lb.client/examples/query_ext.c
@@ -6,7 +6,7 @@
 #include <ctype.h>
 #include <time.h>
 
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #include "consumer.h"
 
 #define BUFF_LEN               1024

diff --git a/org.glite.lb.client/examples/query_seq_code.c b/org.glite.lb.client/examples/query_seq_code.c
index 97f0d7c..29e9de7 100644 (file)
--- a/org.glite.lb.client/examples/query_seq_code.c
+++ b/org.glite.lb.client/examples/query_seq_code.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #include "consumer.h"
 
 

diff --git a/org.glite.lb.client/examples/stress_context.c b/org.glite.lb.client/examples/stress_context.c
index f4743f7..a551d30 100644 (file)
--- a/org.glite.lb.client/examples/stress_context.c
+++ b/org.glite.lb.client/examples/stress_context.c
@@ -4,7 +4,7 @@
 #include <signal.h>
 #include <limits.h>
 
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #include "producer.h"
 #include "glite/lb/events.h"
 

diff --git a/org.glite.lb.client/examples/stresslog.c b/org.glite.lb.client/examples/stresslog.c
index bae9505..da07f89 100644 (file)
--- a/org.glite.lb.client/examples/stresslog.c
+++ b/org.glite.lb.client/examples/stresslog.c
@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #include "producer.h"
 #include "glite/lb/events.h"
 

diff --git a/org.glite.lb.client/interface/Job.h b/org.glite.lb.client/interface/Job.h
index e0c878f..3bc10c8 100644 (file)
--- a/org.glite.lb.client/interface/Job.h
+++ b/org.glite.lb.client/interface/Job.h
@@ -3,7 +3,7 @@
 
 #ident "$Header$"
 
-#include "glite/wmsutils/jobid/JobId.h"
+#include "glite/jobid/JobId.h"
 
 #include "glite/lb/Event.h"
 
@@ -46,7 +46,7 @@ public:
         * represent.
         * \throws Exception Could not copy the job id.
         */
-       Job(const glite::wmsutils::jobid::JobId &jobid);
+       Job(const glite::jobid::JobId &jobid);
 
 
        /** Destructor.
@@ -64,7 +64,7 @@ public:
         * \returns Reference to this object.
         * \throws Exception Could not copy the job id.
         */
-       Job & operator= (const glite::wmsutils::jobid::JobId &jobid);
+       Job & operator= (const glite::jobid::JobId &jobid);
 
        /*
         * Status retrieval bitmasks. Used ORed as Job::status() argument,
@@ -184,7 +184,7 @@ public:
   
 private:
   ServerConnection     server;
-  glite::wmsutils::jobid::JobId                        jobId;
+  glite::jobid::JobId                  jobId;
 };
 
 EWL_END_NAMESPACE

diff --git a/org.glite.lb.client/interface/JobStatus.h.T b/org.glite.lb.client/interface/JobStatus.h.T
index 08e09fd..7776068 100644 (file)
--- a/org.glite.lb.client/interface/JobStatus.h.T
+++ b/org.glite.lb.client/interface/JobStatus.h.T
@@ -12,7 +12,7 @@
 #include <utility>
 #include <vector>
 
-#include "glite/wmsutils/jobid/JobId.h"
+#include "glite/jobid/JobId.h"
 
 #include "glite/lb/jobstat.h"
 #include "glite/lb/CountRef.h"
@@ -156,7 +156,7 @@ public:
         * \returns Value of attribute.
         * \throws LoggingException Invalid attribute name.
         */
-       const glite::wmsutils::jobid::JobId  getValJobId(Attr name) const;
+       const glite::jobid::JobId  getValJobId(Attr name) const;
 
        /** Access method for attribute values.
         *

diff --git a/org.glite.lb.client/interface/Notification.h b/org.glite.lb.client/interface/Notification.h
index 8a0094b..536dad6 100644 (file)
--- a/org.glite.lb.client/interface/Notification.h
+++ b/org.glite.lb.client/interface/Notification.h
@@ -2,7 +2,7 @@
 #define GLITE_LB_NOTIFICATION_HPP
 
 
-#include "glite/wmsutils/jobid/JobId.h"
+#include "glite/jobid/JobId.h"
 
 #include "glite/lb/consumer.h"
 #include "glite/lb/notification.h"
@@ -47,12 +47,12 @@ public:
         * to propagate changes to server 
         * \param[in] jobId             JobId
         */
-       void addJob(const glite::wmsutils::jobid::JobId &jobId); 
+       void addJob(const glite::jobid::JobId &jobId); 
 
        /** Remove job from the list, local op again. 
         * \param[in] jobId             JobId
         */
-       void removeJob(const glite::wmsutils::jobid::JobId &jobId);
+       void removeJob(const glite::jobid::JobId &jobId);
 
        /** Get jobs on the list */
        std::string getJobs();
@@ -82,7 +82,7 @@ public:
        int receive(glite::lb::JobStatus &,timeval &);
 
 private:
-       std::vector<glite::wmsutils::jobid::JobId>      jobs;
+       std::vector<glite::jobid::JobId>        jobs;
        std::vector<glite::lb::JobStatus::Code> states;
 
        edg_wll_Context ctx;

diff --git a/org.glite.lb.client/interface/ServerConnection.h b/org.glite.lb.client/interface/ServerConnection.h
index 8287a8d..24ecdf5 100644 (file)
--- a/org.glite.lb.client/interface/ServerConnection.h
+++ b/org.glite.lb.client/interface/ServerConnection.h
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <list>
 
-#include "glite/wmsutils/jobid/JobId.h"
+#include "glite/jobid/JobId.h"
 
 #include "glite/lb/Event.h"
 #include "glite/lb/JobStatus.h"
@@ -138,7 +138,7 @@ public:
         * \param[in] value             Actual value.
         * \throw Exception Invalid value type for given attribute.
         */
-       QueryRecord(const Attr name, const Op op, const glite::wmsutils::jobid::JobId &value);
+       QueryRecord(const Attr name, const Op op, const glite::jobid::JobId &value);
 
        /* this one is for attr==TIME and particular state */
        /** Constructor for condition on timeval typed value.
@@ -251,7 +251,7 @@ private:
        std::string tag_name;
        int state;
        std::string string_value;
-       glite::wmsutils::jobid::JobId jobid_value;
+       glite::jobid::JobId jobid_value;
         int     int_value;
         struct timeval timeval_value;
        std::string string_value2;
@@ -558,14 +558,14 @@ public:
         * \throws LoggingException Query failed.
         */
        void queryJobs(const std::vector<QueryRecord>& query,
-                      std::vector<glite::wmsutils::jobid::JobId>& jobList) const;
+                      std::vector<glite::jobid::JobId>& jobList) const;
 
         /** Convenience form of queryJobs.
         *
         * The same as above, but job id's are passed as a return
         * value.
         */
-       const std::vector<glite::wmsutils::jobid::JobId>
+       const std::vector<glite::jobid::JobId>
        queryJobs(const std::vector<QueryRecord>& query) const;
   
        
@@ -578,13 +578,13 @@ public:
         * \throws LoggingException Query failed.
         */
        void queryJobs(const std::vector<std::vector<QueryRecord> >& query,
-                      std::vector<glite::wmsutils::jobid::JobId>& jobList) const;
+                      std::vector<glite::jobid::JobId>& jobList) const;
   
         /** Convenience form of queryJobs.
         *
         * Same as above, but result is passed as a retutrn value.
         */
-       const std::vector<glite::wmsutils::jobid::JobId>
+       const std::vector<glite::jobid::JobId>
        queryJobs(const std::vector<std::vector<QueryRecord> >& query) const;
 
        /** Retrieve status of jobs satisfying the given simple query.
@@ -657,13 +657,13 @@ public:
         * \param[out] jobs Id's of jobs owned by this user.
         * \throws LoggingException Query failed.
         */
-       void userJobs(std::vector<glite::wmsutils::jobid::JobId> &jobs) const;
+       void userJobs(std::vector<glite::jobid::JobId> &jobs) const;
 
        /** Convenience form of userJobs.
         *
         * Same as above, but results are passed as a return value.
         */
-       const std::vector<glite::wmsutils::jobid::JobId> userJobs() const;
+       const std::vector<glite::jobid::JobId> userJobs() const;
 
        /** Set communication parameters of integer type.
         *

diff --git a/org.glite.lb.client/interface/consumer.h b/org.glite.lb.client/interface/consumer.h
index 5420bcb..5b82013 100644 (file)
--- a/org.glite.lb.client/interface/consumer.h
+++ b/org.glite.lb.client/interface/consumer.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.client/interface/notification.h b/org.glite.lb.client/interface/notification.h
index 5033733..d9bb98a 100644 (file)
--- a/org.glite.lb.client/interface/notification.h
+++ b/org.glite.lb.client/interface/notification.h
@@ -3,7 +3,7 @@
 
 #ident "$Header$"
 
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #include "glite/lb/notifid.h"
 #include "glite/lb/notif_rec.h"
 #include "glite/lb/context.h"

diff --git a/org.glite.lb.client/src/Event.cpp.T b/org.glite.lb.client/src/Event.cpp.T
index 63adb38..7b800ed 100644 (file)
--- a/org.glite.lb.client/src/Event.cpp.T
+++ b/org.glite.lb.client/src/Event.cpp.T
@@ -9,10 +9,9 @@
 
 #include <errno.h>
 
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 
 #include "glite/lb/Event.h"
-#include "glite/wmsutils/jobid/JobIdExceptions.h"
 #include "glite/lb/events.h"
 #include "glite/lb/notifid.h"
 #include "glite/lb/LoggingExceptions.h"
@@ -280,13 +279,13 @@ badattr:
 }
 
 const 
-glite::wmsutils::jobid::JobId 
+glite::jobid::JobId 
 Event::getValJobId(Attr attr) const
 {
        edg_wll_Event const *cev = (edg_wll_Event *) flesh->ptr;
        try {
                edg_wlc_JobId job_id = get_val_jobid(cev,attr);
-               return(glite::wmsutils::jobid::JobId(job_id));
+               return(glite::jobid::JobId(job_id));
        } 
        catch (Exception &e) {
                STACK_ADD;

diff --git a/org.glite.lb.client/src/Job.cpp b/org.glite.lb.client/src/Job.cpp
index 7c77526..826d2ac 100644 (file)
--- a/org.glite.lb.client/src/Job.cpp
+++ b/org.glite.lb.client/src/Job.cpp
@@ -12,8 +12,6 @@
 
 #include <string>
 
-#include "glite/wmsutils/jobid/JobIdExceptions.h"
-
 #include "glite/lb/Job.h"
 #include "glite/lb/consumer.h"
 #include "glite/lb/LoggingExceptions.h"
@@ -27,19 +25,15 @@ const int Job::STAT_CLASSADS = EDG_WLL_STAT_CLASSADS;
 const int Job::STAT_CHILDREN = EDG_WLL_STAT_CHILDREN;
 const int Job::STAT_CHILDSTAT = EDG_WLL_STAT_CHILDSTAT;
 
-Job::Job(void) 
+Job::Job(void)
+  : jobId() 
 {
 }
 
 
-Job::Job(const glite::wmsutils::jobid::JobId &in) 
+Job::Job(const glite::jobid::JobId &in) 
+  : jobId(in)
 {
-  try {
-    jobId = in;
-  } catch (Exception &e) {
-    STACK_ADD;
-    throw;
-  }
 }
 
 
@@ -48,7 +42,7 @@ Job::~Job(void)
 }
 
 
-Job & Job::operator= (const glite::wmsutils::jobid::JobId &in) 
+Job & Job::operator= (const glite::jobid::JobId &in) 
 {
   try {
     jobId = in;
@@ -68,7 +62,7 @@ Job::status(int flags) const
   try {
     edg_wll_JobStat    *cstat = jobStatus.c_ptr();
     int ret = edg_wll_JobStatus(server.getContext(),
-                               jobId, // automagically converted by member operator
+                               const_cast<glite_jobid_t>(jobId.c_jobid()), 
                                flags,
                                cstat);
     check_result(ret,
@@ -97,7 +91,7 @@ Job::log(std::vector<Event> &eventList) const
 
   try {
     context = server.getContext();
-    result = edg_wll_JobLog(context, jobId, &events);
+    result = edg_wll_JobLog(context, const_cast<glite_jobid_t>(jobId.c_jobid()), &events);
     if (result == E2BIG) {
            edg_wll_Error(context, NULL, &errstr);
            check_result(edg_wll_GetParam(context,
@@ -153,10 +147,10 @@ Job::queryListener(std::string const & name) const
 
   try {
     int ret = edg_wll_QueryListener(server.getContext(),
-                                      jobId,
-                                      name.c_str(),
-                                      &c_host,
-                                      &port);
+                                   const_cast<glite_jobid_t>(jobId.c_jobid()),
+                                   name.c_str(),
+                                   &c_host,
+                                   &port);
     check_result(ret,
                 server.getContext(),
                 "edg_wll_QueryListener");

diff --git a/org.glite.lb.client/src/JobStatus.cpp.T b/org.glite.lb.client/src/JobStatus.cpp.T
index 0038d32..5498313 100644 (file)
--- a/org.glite.lb.client/src/JobStatus.cpp.T
+++ b/org.glite.lb.client/src/JobStatus.cpp.T
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "glite/wmsutils/jobid/JobId.h"
+#include "glite/jobid/JobId.h"
 #include "glite/lb/LoggingExceptions.h"
 
 #include "glite/lb/consumer.h"
@@ -231,14 +231,14 @@ get_val_jobid(edg_wll_JobStat const *cstat, JobStatus::Attr attr)
 
 
 const 
-glite::wmsutils::jobid::JobId  
+glite::jobid::JobId  
 JobStatus::getValJobId(Attr attr) const
 {
   edg_wll_JobStat const *cstat = (edg_wll_JobStat *) flesh->ptr;
 
   try {
          edg_wlc_JobId job_id = get_val_jobid(cstat, attr);
-         return(glite::wmsutils::jobid::JobId(job_id));
+         return(glite::jobid::JobId(job_id));
   }
   catch(Exception &e) {
          STACK_ADD;

diff --git a/org.glite.lb.client/src/Notification.cpp b/org.glite.lb.client/src/Notification.cpp
index 0441626..ad6a997 100644 (file)
--- a/org.glite.lb.client/src/Notification.cpp
+++ b/org.glite.lb.client/src/Notification.cpp
@@ -132,9 +132,9 @@ Notification::getFd(void) const
 }
 
 void
-Notification::addJob(const glite::wmsutils::jobid::JobId &jobId)
+Notification::addJob(const glite::jobid::JobId &jobId)
 {
-   std::vector<glite::wmsutils::jobid::JobId>::iterator it;
+   std::vector<glite::jobid::JobId>::iterator it;
 
    try {
        if (this->notifId != NULL) {
@@ -156,9 +156,9 @@ Notification::addJob(const glite::wmsutils::jobid::JobId &jobId)
 }
 
 void
-Notification::removeJob(const glite::wmsutils::jobid::JobId &jobId)
+Notification::removeJob(const glite::jobid::JobId &jobId)
 {
-   std::vector<glite::wmsutils::jobid::JobId>::iterator it;
+   std::vector<glite::jobid::JobId>::iterator it;
    int removed = 0;
 
    try {
@@ -189,7 +189,7 @@ Notification::removeJob(const glite::wmsutils::jobid::JobId &jobId)
 std::string 
 Notification::getJobs(void)
 {
-   std::vector<glite::wmsutils::jobid::JobId>::iterator it;
+   std::vector<glite::jobid::JobId>::iterator it;
    std::string ret="";
 
    try {
@@ -240,7 +240,7 @@ void
 Notification::Register(void)
 {
    int ret = 0;
-   std::vector<glite::wmsutils::jobid::JobId>::iterator it;
+   std::vector<glite::jobid::JobId>::iterator it;
    std::vector<glite::lb::JobStatus::Code>::iterator its;
    std::vector<std::vector<glite::lb::QueryRecord> > queryExt;
    edg_wll_QueryRec **conditions = NULL;

diff --git a/org.glite.lb.client/src/ServerConnection.cpp b/org.glite.lb.client/src/ServerConnection.cpp
index ad5eaa1..067db53 100644 (file)
--- a/org.glite.lb.client/src/ServerConnection.cpp
+++ b/org.glite.lb.client/src/ServerConnection.cpp
@@ -14,8 +14,7 @@
 
 #include <expat.h>
 
-#include "glite/wmsutils/jobid/JobId.h"
-#include "glite/wmsutils/jobid/JobIdExceptions.h"
+#include "glite/jobid/JobId.h"
 #include "glite/lb/context-int.h"
 #include "glite/lb/xml_conversions.h"
 
@@ -89,7 +88,7 @@ QueryRecord::QueryRecord(const Attr a,
 
 QueryRecord::QueryRecord(const Attr a, 
                         const Op o, 
-                        const glite::wmsutils::jobid::JobId& v)
+                        const glite::jobid::JobId& v)
        : attr(a), oper(o), state(EDG_WLL_JOB_UNDEF), jobid_value(v)
 {
        switch(a) {
@@ -394,8 +393,10 @@ QueryRecord::operator edg_wll_QueryRec() const
                break;
 
        case JOBID:
-               out.value.j = jobid_value;
-               break;
+           if(glite_jobid_dup(jobid_value.c_jobid(), &out.value.j)) {
+               throw std::bad_alloc();
+           }
+           break;
 
        case UNDEF:
                break;
@@ -619,6 +620,13 @@ void freeQueryRecVector(edg_wll_QueryRec *v)
                edg_wll_QueryRecFree(v);
 }
 
+// static
+void freeQueryRecVectorExt(edg_wll_QueryRec **v)
+{
+    for(; *v; v++)
+       edg_wll_QueryRecFree(*v);
+}
+
 std::vector<std::vector<std::pair<QueryRecord::Attr,std::string> > >
 ServerConnection::getIndexedAttrs(void) {
        edg_wll_QueryRec        **recs;
@@ -750,10 +758,14 @@ ServerConnection::queryEvents(const std::vector<QueryRecord>& job_cond,
                }
     
                free(events);
+               freeQueryRecVector(job_rec);
+               freeQueryRecVector(event_rec);
                delete[] job_rec;
                delete[] event_rec;
 
        } catch(Exception &e) {
+               freeQueryRecVector(job_rec);
+               freeQueryRecVector(event_rec);
                if(job_rec) delete[] job_rec;
                if(event_rec) delete[] event_rec;
                if(events) free(events);
@@ -831,21 +843,17 @@ ServerConnection::queryEvents(const std::vector<std::vector<QueryRecord> >& job_
     
                free(events);
 
-               for(i = 0 ; job_rec[i]; i++) delete[] job_rec[i];
-               for(i = 0 ; event_rec[i]; i++) delete[] event_rec[i];
+               freeQueryRecVectorExt(job_rec);
+               freeQueryRecVectorExt(event_rec);
                delete[] job_rec;
                delete[] event_rec;
 
        } catch(Exception &e) {
 
-               if(job_rec) {
-                       for(i = 0 ; job_rec[i]; i++) delete[] job_rec[i];
-                       delete[] job_rec;
-               }
-               if(event_rec) { 
-                       for(i = 0 ; event_rec[i]; i++) delete[] event_rec[i];
-                       delete[] event_rec;
-               }
+               freeQueryRecVectorExt(job_rec);
+               freeQueryRecVectorExt(event_rec);
+               delete[] job_rec;
+               delete[] event_rec;
                if(events) free(events);
 
                STACK_ADD;
@@ -866,7 +874,7 @@ ServerConnection::queryEvents(const std::vector<std::vector<QueryRecord> >& job_
 
 
 void ServerConnection::queryJobs(const std::vector<QueryRecord>& query,
-                                std::vector<glite::wmsutils::jobid::JobId> & ids) const
+                                std::vector<glite::jobid::JobId> & ids) const
 {
        edg_wll_QueryRec *cond = NULL;
        edg_wlc_JobId *jobs, *j;
@@ -892,7 +900,7 @@ void ServerConnection::queryJobs(const std::vector<QueryRecord>& query,
                }
 
                for(j = jobs; *j; j++) 
-                       ids.push_back(glite::wmsutils::jobid::JobId(*j));
+                       ids.push_back(glite::jobid::JobId(*j));
 
                if (result) {
                        edg_wll_SetError(context, result, errstr);
@@ -916,10 +924,10 @@ void ServerConnection::queryJobs(const std::vector<QueryRecord>& query,
 }
 
 
-const std::vector<glite::wmsutils::jobid::JobId>
+const std::vector<glite::jobid::JobId>
 ServerConnection::queryJobs(const std::vector<QueryRecord>& query) const
 {
-       std::vector<glite::wmsutils::jobid::JobId> jobList;
+       std::vector<glite::jobid::JobId> jobList;
   
        queryJobs(query, jobList);
        return jobList;
@@ -928,7 +936,7 @@ ServerConnection::queryJobs(const std::vector<QueryRecord>& query) const
 
 void 
 ServerConnection::queryJobs(const std::vector<std::vector<QueryRecord> >& query,
-                           std::vector<glite::wmsutils::jobid::JobId>& ids) const
+                           std::vector<glite::jobid::JobId>& ids) const
 {
        edg_wll_QueryRec **cond = NULL;
        edg_wlc_JobId *jobs, *j;
@@ -955,7 +963,7 @@ ServerConnection::queryJobs(const std::vector<std::vector<QueryRecord> >& query,
                }
 
                for(j = jobs; *j; j++) 
-                       ids.push_back(glite::wmsutils::jobid::JobId(*j));
+                       ids.push_back(glite::jobid::JobId(*j));
 
                if (result) {
                        edg_wll_SetError(context, result, errstr);
@@ -991,10 +999,10 @@ ServerConnection::queryJobs(const std::vector<std::vector<QueryRecord> >& query,
 
   
 const 
-std::vector<glite::wmsutils::jobid::JobId>
+std::vector<glite::jobid::JobId>
 ServerConnection::queryJobs(const std::vector<std::vector<QueryRecord> >& query) const
 {
-       std::vector<glite::wmsutils::jobid::JobId> jobList;
+       std::vector<glite::jobid::JobId> jobList;
   
        queryJobs(query, jobList);
        return jobList;
@@ -1164,7 +1172,7 @@ ServerConnection::queryJobStates(const std::vector<std::vector<QueryRecord> >& q
 }
 
 
-void ServerConnection::userJobs(std::vector<glite::wmsutils::jobid::JobId> & ids) const
+void ServerConnection::userJobs(std::vector<glite::jobid::JobId> & ids) const
 {
        edg_wlc_JobId *jobs, *j;
        int     result, qresults_param;
@@ -1187,7 +1195,7 @@ void ServerConnection::userJobs(std::vector<glite::wmsutils::jobid::JobId> & ids
                }
 
                for(j = jobs; *j; j++) 
-                       ids.push_back(glite::wmsutils::jobid::JobId(*j));
+                       ids.push_back(glite::jobid::JobId(*j));
 
                if (result) {
                        edg_wll_SetError(context, result, errstr);
@@ -1205,10 +1213,10 @@ void ServerConnection::userJobs(std::vector<glite::wmsutils::jobid::JobId> & ids
 }
 
 
-const std::vector<glite::wmsutils::jobid::JobId>
+const std::vector<glite::jobid::JobId>
 ServerConnection::userJobs() const
 {
-       std::vector<glite::wmsutils::jobid::JobId> jobList;
+       std::vector<glite::jobid::JobId> jobList;
   
        userJobs(jobList);
        return jobList;

diff --git a/org.glite.lb.client/src/consumer.c b/org.glite.lb.client/src/consumer.c
index 9a9a788..1dcdbdd 100644 (file)
--- a/org.glite.lb.client/src/consumer.c
+++ b/org.glite.lb.client/src/consumer.c
@@ -9,6 +9,7 @@
 
 #include <expat.h>
 
+#include "glite/jobid/cjobid.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 87162c4..1985b8b 100644 (file)
--- a/org.glite.lb.client/src/logevent.c.T
+++ b/org.glite.lb.client/src/logevent.c.T
@@ -14,7 +14,7 @@
 #include <ctype.h> // isspace
 
 #include "glite/security/glite_gss.h"
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #include "glite/lb/notifid.h"
 #include "glite/lb/events.h"
 

diff --git a/org.glite.lb.client/src/perftest_jobreg.c b/org.glite.lb.client/src/perftest_jobreg.c
index e03bee8..912dbc9 100644 (file)
--- a/org.glite.lb.client/src/perftest_jobreg.c
+++ b/org.glite.lb.client/src/perftest_jobreg.c
@@ -6,7 +6,7 @@
 #include <fcntl.h>
 #include <sys/time.h>
 
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #include "glite/lb/producer.h"
 #include "glite/lb/events.h"
 

diff --git a/org.glite.lb.client/src/producer.c b/org.glite.lb.client/src/producer.c
index a402719..2d77f52 100644 (file)
--- a/org.glite.lb.client/src/producer.c
+++ b/org.glite.lb.client/src/producer.c
@@ -10,7 +10,8 @@
 #include <syslog.h>
 #include <string.h>
 
-#include "glite/wmsutils/jobid/strmd5.h"
+#include "glite/jobid/cjobid.h"
+#include "glite/jobid/strmd5.h"
 #include "glite/lb/ulm_parse.h"
 #include "glite/lb/trio.h"
 #include "glite/lb/context-int.h" 

diff --git a/org.glite.lb.client/src/uiwrap.c.T b/org.glite.lb.client/src/uiwrap.c.T
index 8c57aa3..d759b85 100644 (file)
--- a/org.glite.lb.client/src/uiwrap.c.T
+++ b/org.glite.lb.client/src/uiwrap.c.T
@@ -5,7 +5,7 @@
 @@@LANG: C
 
 #include <stdlib.h>
-#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/jobid/cjobid.h"
 #include "glite/lb/producer.h"
 
 @@@{