Adjust namespaces and include file paths to the new wmsutils module.

diff --git a/org.glite.lb.client-interface/interface/Event.h.T b/org.glite.lb.client-interface/interface/Event.h.T
index 4c53c7f..64b4958 100644 (file)
--- a/org.glite.lb.client-interface/interface/Event.h.T
+++ b/org.glite.lb.client-interface/interface/Event.h.T
@@ -6,7 +6,7 @@
 #include <vector>
 #include <string>
 
-#include "glite/wms/jobid/JobId.h"
+#include "glite/wmsutils/jobid/JobId.h"
 #include "glite/lb/CountRef.h"
 
 #ident "$Header$"
@@ -130,7 +130,7 @@ public:
         struct timeval getValTime(Attr) const;
                
         /** Retrieve jobid attribute */
-        const glite::wms::jobid::JobId getValJobId(Attr) const;
+        const glite::wmsutils::jobid::JobId getValJobId(Attr) const;
 
        /** Attribute name */
        const std::string & getAttrName(Attr) const;

diff --git a/org.glite.lb.client-interface/interface/Job.h b/org.glite.lb.client-interface/interface/Job.h
index 870c88d..8f69ed8 100644 (file)
--- a/org.glite.lb.client-interface/interface/Job.h
+++ b/org.glite.lb.client-interface/interface/Job.h
@@ -3,7 +3,7 @@
 
 #ident "$Header$"
 
-#include "glite/wms/jobid/JobId.h"
+#include "glite/wmsutils/jobid/JobId.h"
 
 #include "glite/lb/Event.h"
 #include "glite/lb/JobStatus.h"
@@ -25,14 +25,14 @@ EWL_BEGIN_NAMESPACE;
 class Job {
 public:
   Job(void);
-  Job(const glite::wms::jobid::JobId &);
+  Job(const glite::wmsutils::jobid::JobId &);
   ~Job();
   
   /** Assign new JobId to an existing instance.
    * Connection to server is preserved if possible.
    */
   
-  Job & operator= (const glite::wms::jobid::JobId &);
+  Job & operator= (const glite::wmsutils::jobid::JobId &);
 
 /**
  * Status retrieval bitmasks. Used ORed as Job::status() argument,
@@ -66,7 +66,7 @@ public:
   
 private:
   ServerConnection     server;
-  glite::wms::jobid::JobId                     jobId;
+  glite::wmsutils::jobid::JobId                        jobId;
 };
 
 EWL_END_NAMESPACE;

diff --git a/org.glite.lb.client-interface/interface/JobStatus.h.T b/org.glite.lb.client-interface/interface/JobStatus.h.T
index fc1af5c..8b63de1 100644 (file)
--- a/org.glite.lb.client-interface/interface/JobStatus.h.T
+++ b/org.glite.lb.client-interface/interface/JobStatus.h.T
@@ -12,7 +12,7 @@
 #include <utility>
 #include <vector>
 
-#include "glite/wms/jobid/JobId.h"
+#include "glite/wmsutils/jobid/JobId.h"
 
 #include "glite/lb/jobstat.h"
 #include "glite/lb/CountRef.h"
@@ -107,7 +107,7 @@ public:
        struct timeval  getValTime(Attr) const;
   
        /** Retrieve jobid attribute */
-       const glite::wms::jobid::JobId  getValJobId(Attr) const;
+       const glite::wmsutils::jobid::JobId  getValJobId(Attr) const;
 
        /** Retrieve bool attribute */
        bool getValBool(Attr) const;

diff --git a/org.glite.lb.client-interface/interface/LoggingExceptions.h b/org.glite.lb.client-interface/interface/LoggingExceptions.h
index eea476d..8167fdd 100644 (file)
--- a/org.glite.lb.client-interface/interface/LoggingExceptions.h
+++ b/org.glite.lb.client-interface/interface/LoggingExceptions.h
@@ -1,19 +1,19 @@
 #ifndef __EDG_WORKLOAD_LOGGING_CLIENT_LOGGING_EXCEPTIONS_HPP__
 #define __EDG_WORKLOAD_LOGGING_CLIENT_LOGGING_EXCEPTIONS_HPP__
 
-#include "glite/wms/common/utilities/Exceptions.h"
-
-#include <pthread.h>
-
 #ident "$Header$"
 
 /** @file LoggingExceptions.h
  *  @version $Revision$
  */
 
+#include "glite/wmsutils/exception/Exceptions.h"
+
+#include <pthread.h>
+
 EWL_BEGIN_NAMESPACE;
 
-class Exception: public glite::wms::common::utilities::Exception {
+class Exception: public glite::wmsutils::exception::Exception {
 public:
        
        /* constructor for mandatory fields */
@@ -22,7 +22,7 @@ public:
                  const std::string& method,
                  int   code,
                  const std::string& exception) 
-               : glite::wms::common::utilities::Exception(source, 
+               : glite::wmsutils::exception::Exception(source, 
                                                              line_number, 
                                                              method, 
                                                              code, 
@@ -35,8 +35,8 @@ public:
                  const std::string& method,
                  int   code,
                  const std::string& exception,
-                 const glite::wms::common::utilities::Exception &exc)
-               : glite::wms::common::utilities::Exception(source, 
+                 const glite::wmsutils::exception::Exception &exc)
+               : glite::wmsutils::exception::Exception(source, 
                                                              line_number, 
                                                              method, 
                                                              code, 
@@ -63,7 +63,7 @@ public:
                         const std::string& method,
                         int   code,
                         const std::string& exception, 
-                        const glite::wms::common::utilities::Exception &exc)
+                        const glite::wmsutils::exception::Exception &exc)
                : Exception(source, line_number, method, code, exception)
                {};
 };
@@ -91,7 +91,7 @@ public:
                    const std::string& method,
                    int   code,
                    const std::string& exception,
-                   const glite::wms::common::utilities::Exception &exc)
+                   const glite::wmsutils::exception::Exception &exc)
                : Exception(source, 
                            line_number, 
                            method, 

diff --git a/org.glite.lb.client-interface/interface/Notification.h b/org.glite.lb.client-interface/interface/Notification.h
index 574d59f..0e0b04a 100644 (file)
--- a/org.glite.lb.client-interface/interface/Notification.h
+++ b/org.glite.lb.client-interface/interface/Notification.h
@@ -2,7 +2,7 @@
 #define __EDG_WORKLOAD_LOGGING_CLIENT_NOTIFICATION_HPP__
 
 
-#include "glite/wms/jobid/JobId.h"
+#include "glite/wmsutils/jobid/JobId.h"
 
 #include "glite/lb/consumer.h"
 #include "glite/lb/notification.h"
@@ -36,10 +36,10 @@ public:
         * Local operation only, Register() has to be called
         * to propagate changes to server 
         */
-       void addJob(const glite::wms::jobid::JobId &); 
+       void addJob(const glite::wmsutils::jobid::JobId &); 
 
        /** Remove job from the list, local op again. */
-       void removeJob(const glite::wms::jobid::JobId &);
+       void removeJob(const glite::wmsutils::jobid::JobId &);
 
        /** Get jobs on the list */
        std::string getJobs();
@@ -63,7 +63,7 @@ public:
        int receive(glite::lb::JobStatus &,timeval &);
 
 private:
-       std::vector<glite::wms::jobid::JobId>   jobs;
+       std::vector<glite::wmsutils::jobid::JobId>      jobs;
        std::vector<glite::lb::JobStatus::Code> states;
 
        edg_wll_Context ctx;

diff --git a/org.glite.lb.client-interface/interface/ServerConnection.h b/org.glite.lb.client-interface/interface/ServerConnection.h
index adf7284..333d0bd 100644 (file)
--- a/org.glite.lb.client-interface/interface/ServerConnection.h
+++ b/org.glite.lb.client-interface/interface/ServerConnection.h
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <list>
 
-#include "glite/wms/jobid/JobId.h"
+#include "glite/wmsutils/jobid/JobId.h"
 
 #include "glite/lb/Event.h"
 #include "glite/lb/JobStatus.h"
@@ -65,7 +65,7 @@ public:
        QueryRecord(const Attr, const Op, const std::string &);
        QueryRecord(const Attr, const Op, const int);
        QueryRecord(const Attr, const Op, const struct timeval &);
-       QueryRecord(const Attr, const Op, const glite::wms::jobid::JobId&);
+       QueryRecord(const Attr, const Op, const glite::wmsutils::jobid::JobId&);
        /* this one is for attr==TIME and particular state */
        QueryRecord(const Attr, const Op, const int, const struct timeval &);
        
@@ -94,7 +94,7 @@ private:
        std::string tag_name;
        int state;
        std::string string_value;
-       glite::wms::jobid::JobId jobid_value;
+       glite::wmsutils::jobid::JobId jobid_value;
         int     int_value;
         struct timeval timeval_value;
        std::string string_value2;
@@ -222,9 +222,9 @@ public:
         */
   
        void queryJobs(const std::vector<QueryRecord>& query,
-                      std::vector<glite::wms::jobid::JobId>& ids) const;
+                      std::vector<glite::wmsutils::jobid::JobId>& ids) const;
   
-       const std::vector<glite::wms::jobid::JobId>
+       const std::vector<glite::wmsutils::jobid::JobId>
        queryJobs(const std::vector<QueryRecord>& query) const;
   
        
@@ -236,9 +236,9 @@ public:
         */
    
        void queryJobs(const std::vector<std::vector<QueryRecord> >& query,
-                      std::vector<glite::wms::jobid::JobId>& ids) const;
+                      std::vector<glite::wmsutils::jobid::JobId>& ids) const;
   
-       const std::vector<glite::wms::jobid::JobId>
+       const std::vector<glite::wmsutils::jobid::JobId>
        queryJobs(const std::vector<std::vector<QueryRecord> >& query) const;
 
        /** Retrieve jobs satisfying the query records, including status
@@ -281,8 +281,8 @@ public:
        /** JobId's of all user's jobs.
         * Convenience wrapper around queryJobs.
         */
-       void userJobs(std::vector<glite::wms::jobid::JobId> &) const;
-       const std::vector<glite::wms::jobid::JobId> userJobs() const;
+       void userJobs(std::vector<glite::wmsutils::jobid::JobId> &) const;
+       const std::vector<glite::wmsutils::jobid::JobId> userJobs() const;
 
        /** Manipulate LB parameters, the same as for edg_wll_Context in C */
        void setParam(edg_wll_ContextParam, int); 

diff --git a/org.glite.lb.client-interface/interface/consumer.h b/org.glite.lb.client-interface/interface/consumer.h
index 0b7b63a..7ae4acd 100644 (file)
--- a/org.glite.lb.client-interface/interface/consumer.h
+++ b/org.glite.lb.client-interface/interface/consumer.h
@@ -17,7 +17,7 @@
 
 #ident "$Header$"
 
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/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/interface/context.h b/org.glite.lb.client-interface/interface/context.h
index 1560924..634f884 100644 (file)
--- a/org.glite.lb.client-interface/interface/context.h
+++ b/org.glite.lb.client-interface/interface/context.h
@@ -6,8 +6,8 @@
  * \brief L&B API common context (publicly visible) and related definitions
  */
 
-#include "glite/wms/common/utilities/exception_codes.h"
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/exception/exception_codes.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 
 #ident "$Header$"
 

diff --git a/org.glite.lb.client-interface/interface/events.h.T b/org.glite.lb.client-interface/interface/events.h.T
index 971d916..e37be1f 100644 (file)
--- a/org.glite.lb.client-interface/interface/events.h.T
+++ b/org.glite.lb.client-interface/interface/events.h.T
@@ -15,7 +15,7 @@
 #include <sys/time.h>
 #include <inttypes.h>
 
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/lb/context.h"
 #include "glite/lb/notifid.h"
 

diff --git a/org.glite.lb.client-interface/interface/notification.h b/org.glite.lb.client-interface/interface/notification.h
index b869daf..a16215d 100644 (file)
--- a/org.glite.lb.client-interface/interface/notification.h
+++ b/org.glite.lb.client-interface/interface/notification.h
@@ -3,7 +3,7 @@
 
 #ident "$Header$"
 
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/lb/notifid.h"
 #include "glite/lb/context.h"
 #include "glite/lb/consumer.h"

diff --git a/org.glite.lb.client/src/Event.cpp.T b/org.glite.lb.client/src/Event.cpp.T
index 9e07ed3..7e32f62 100644 (file)
--- a/org.glite.lb.client/src/Event.cpp.T
+++ b/org.glite.lb.client/src/Event.cpp.T
@@ -9,10 +9,10 @@
 
 #include <errno.h>
 
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 
 #include "glite/lb/Event.h"
-#include "glite/wms/jobid/JobIdExceptions.h"
+#include "glite/wmsutils/jobid/JobIdExceptions.h"
 #include "glite/lb/LoggingExceptions.h"
 
 #include "glite/lb/consumer.h"
@@ -220,13 +220,13 @@ badattr:
 }
 
 const 
-glite::wms::jobid::JobId 
+glite::wmsutils::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::wms::jobid::JobId(job_id));
+               return(glite::wmsutils::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 76f1e10..81ddbe4 100644 (file)
--- a/org.glite.lb.client/src/Job.cpp
+++ b/org.glite.lb.client/src/Job.cpp
@@ -12,7 +12,7 @@
 
 #include <string>
 
-#include "glite/wms/jobid/JobIdExceptions.h"
+#include "glite/wmsutils/jobid/JobIdExceptions.h"
 
 #include "glite/lb/Job.h"
 #include "glite/lb/LoggingExceptions.h"
@@ -32,7 +32,7 @@ Job::Job(void)
 }
 
 
-Job::Job(const glite::wms::jobid::JobId &in) 
+Job::Job(const glite::wmsutils::jobid::JobId &in) 
 {
   try {
     jobId = in;
@@ -48,7 +48,7 @@ Job::~Job(void)
 }
 
 
-Job & Job::operator= (const glite::wms::jobid::JobId &in) 
+Job & Job::operator= (const glite::wmsutils::jobid::JobId &in) 
 {
   try {
     jobId = in;

diff --git a/org.glite.lb.client/src/JobStatus.cpp.T b/org.glite.lb.client/src/JobStatus.cpp.T
index d29f948..df9609b 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/wms/jobid/JobId.h"
+#include "glite/wmsutils/jobid/JobId.h"
 
 #include "glite/lb/JobStatus.h"
 #include "glite/lb/LoggingExceptions.h"
@@ -231,14 +231,14 @@ get_val_jobid(edg_wll_JobStat const *cstat, JobStatus::Attr attr)
 
 
 const 
-glite::wms::jobid::JobId  
+glite::wmsutils::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::wms::jobid::JobId(job_id));
+         return(glite::wmsutils::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 f1cd57f..30ba1d7 100644 (file)
--- a/org.glite.lb.client/src/Notification.cpp
+++ b/org.glite.lb.client/src/Notification.cpp
@@ -115,9 +115,9 @@ Notification::getFd(void) const
 }
 
 void
-Notification::addJob(const glite::wms::jobid::JobId &jobId)
+Notification::addJob(const glite::wmsutils::jobid::JobId &jobId)
 {
-   std::vector<glite::wms::jobid::JobId>::iterator it;
+   std::vector<glite::wmsutils::jobid::JobId>::iterator it;
 
    try {
        for( it = jobs.begin(); it != jobs.end(); it++ ) {
@@ -135,9 +135,9 @@ Notification::addJob(const glite::wms::jobid::JobId &jobId)
 }
 
 void
-Notification::removeJob(const glite::wms::jobid::JobId &jobId)
+Notification::removeJob(const glite::wmsutils::jobid::JobId &jobId)
 {
-   std::vector<glite::wms::jobid::JobId>::iterator it;
+   std::vector<glite::wmsutils::jobid::JobId>::iterator it;
    int removed = 0;
 
    try {
@@ -162,7 +162,7 @@ Notification::removeJob(const glite::wms::jobid::JobId &jobId)
 std::string 
 Notification::getJobs(void)
 {
-   std::vector<glite::wms::jobid::JobId>::iterator it;
+   std::vector<glite::wmsutils::jobid::JobId>::iterator it;
    std::string ret="";
 
    try {
@@ -209,7 +209,7 @@ void
 Notification::Register(void)
 {
    int ret = 0;
-   std::vector<glite::wms::jobid::JobId>::iterator it;
+   std::vector<glite::wmsutils::jobid::JobId>::iterator it;
    std::vector<glite::lb::JobStatus::Code>::iterator its;
    std::vector<std::vector<glite::lb::QueryRecord> > query;
    edg_wll_QueryRec **conditions = NULL;

diff --git a/org.glite.lb.client/src/ServerConnection.cpp b/org.glite.lb.client/src/ServerConnection.cpp
index 40ecde1..9292c86 100644 (file)
--- a/org.glite.lb.client/src/ServerConnection.cpp
+++ b/org.glite.lb.client/src/ServerConnection.cpp
@@ -14,8 +14,8 @@
 
 #include <expat.h>
 
-#include "glite/wms/jobid/JobId.h"
-#include "glite/wms/jobid/JobIdExceptions.h"
+#include "glite/wmsutils/jobid/JobId.h"
+#include "glite/wmsutils/jobid/JobIdExceptions.h"
 #include "glite/lb/context-int.h"
 #include "glite/lb/xml_conversions.h"
 
@@ -89,7 +89,7 @@ QueryRecord::QueryRecord(const Attr a,
 
 QueryRecord::QueryRecord(const Attr a, 
                         const Op o, 
-                        const glite::wms::jobid::JobId& v)
+                        const glite::wmsutils::jobid::JobId& v)
        : attr(a), oper(o), state(EDG_WLL_JOB_UNDEF), jobid_value(v)
 {
        switch(a) {
@@ -831,7 +831,7 @@ ServerConnection::queryEvents(const std::vector<std::vector<QueryRecord> >& job_
 
 
 void ServerConnection::queryJobs(const std::vector<QueryRecord>& query,
-                                std::vector<glite::wms::jobid::JobId> & ids) const
+                                std::vector<glite::wmsutils::jobid::JobId> & ids) const
 {
        edg_wll_QueryRec *cond = NULL;
        edg_wlc_JobId *jobs, *j;
@@ -857,7 +857,7 @@ void ServerConnection::queryJobs(const std::vector<QueryRecord>& query,
                }
 
                for(j = jobs; *j; j++) 
-                       ids.push_back(glite::wms::jobid::JobId(*j));
+                       ids.push_back(glite::wmsutils::jobid::JobId(*j));
 
                if (result) {
                        edg_wll_SetError(context, result, errstr);
@@ -881,10 +881,10 @@ void ServerConnection::queryJobs(const std::vector<QueryRecord>& query,
 }
 
 
-const std::vector<glite::wms::jobid::JobId>
+const std::vector<glite::wmsutils::jobid::JobId>
 ServerConnection::queryJobs(const std::vector<QueryRecord>& query) const
 {
-       std::vector<glite::wms::jobid::JobId> jobList;
+       std::vector<glite::wmsutils::jobid::JobId> jobList;
   
        queryJobs(query, jobList);
        return jobList;
@@ -893,7 +893,7 @@ ServerConnection::queryJobs(const std::vector<QueryRecord>& query) const
 
 void 
 ServerConnection::queryJobs(const std::vector<std::vector<QueryRecord> >& query,
-                           std::vector<glite::wms::jobid::JobId>& ids) const
+                           std::vector<glite::wmsutils::jobid::JobId>& ids) const
 {
        edg_wll_QueryRec **cond = NULL;
        edg_wlc_JobId *jobs, *j;
@@ -920,7 +920,7 @@ ServerConnection::queryJobs(const std::vector<std::vector<QueryRecord> >& query,
                }
 
                for(j = jobs; *j; j++) 
-                       ids.push_back(glite::wms::jobid::JobId(*j));
+                       ids.push_back(glite::wmsutils::jobid::JobId(*j));
 
                if (result) {
                        edg_wll_SetError(context, result, errstr);
@@ -956,10 +956,10 @@ ServerConnection::queryJobs(const std::vector<std::vector<QueryRecord> >& query,
 
   
 const 
-std::vector<glite::wms::jobid::JobId>
+std::vector<glite::wmsutils::jobid::JobId>
 ServerConnection::queryJobs(const std::vector<std::vector<QueryRecord> >& query) const
 {
-       std::vector<glite::wms::jobid::JobId> jobList;
+       std::vector<glite::wmsutils::jobid::JobId> jobList;
   
        queryJobs(query, jobList);
        return jobList;
@@ -1129,7 +1129,7 @@ ServerConnection::queryJobStates(const std::vector<std::vector<QueryRecord> >& q
 }
 
 
-void ServerConnection::userJobs(std::vector<glite::wms::jobid::JobId> & ids) const
+void ServerConnection::userJobs(std::vector<glite::wmsutils::jobid::JobId> & ids) const
 {
        edg_wlc_JobId *jobs, *j;
        int     result, qresults_param;
@@ -1152,7 +1152,7 @@ void ServerConnection::userJobs(std::vector<glite::wms::jobid::JobId> & ids) con
                }
 
                for(j = jobs; *j; j++) 
-                       ids.push_back(glite::wms::jobid::JobId(*j));
+                       ids.push_back(glite::wmsutils::jobid::JobId(*j));
 
                if (result) {
                        edg_wll_SetError(context, result, errstr);
@@ -1170,10 +1170,10 @@ void ServerConnection::userJobs(std::vector<glite::wms::jobid::JobId> & ids) con
 }
 
 
-const std::vector<glite::wms::jobid::JobId>
+const std::vector<glite::wmsutils::jobid::JobId>
 ServerConnection::userJobs() const
 {
-       std::vector<glite::wms::jobid::JobId> jobList;
+       std::vector<glite::wmsutils::jobid::JobId> jobList;
   
        userJobs(jobList);
        return jobList;

diff --git a/org.glite.lb.client/src/connection.c b/org.glite.lb.client/src/connection.c
index 2e09ac7..14939cc 100644 (file)
--- a/org.glite.lb.client/src/connection.c
+++ b/org.glite.lb.client/src/connection.c
@@ -10,7 +10,7 @@
 #include <netdb.h>
 
 #include "globus_config.h"
-#include "glite/wms/thirdparty/globus_ssl_utils/sslutils.h"
+#include "glite/wmsutils/thirdparty/globus_ssl_utils/sslutils.h"
 
 #include "glite/lb/consumer.h"
 #include "glite/lb/context-int.h"

diff --git a/org.glite.lb.client/src/consumer.c b/org.glite.lb.client/src/consumer.c
index d94dbbc..d3313a1 100644 (file)
--- a/org.glite.lb.client/src/consumer.c
+++ b/org.glite.lb.client/src/consumer.c
@@ -10,7 +10,7 @@
 #include <expat.h>
 
 #include "globus_config.h"
-#include "glite/wms/thirdparty/globus_ssl_utils/sslutils.h"
+#include "glite/wmsutils/thirdparty/globus_ssl_utils/sslutils.h"
 
 #include "glite/lb/consumer.h"
 #include "glite/lb/context-int.h"

diff --git a/org.glite.lb.client/src/dump.c b/org.glite.lb.client/src/dump.c
index e4e4542..3575036 100644 (file)
--- a/org.glite.lb.client/src/dump.c
+++ b/org.glite.lb.client/src/dump.c
@@ -18,7 +18,7 @@
 #include "glite/lb/ulm_parse.h"
 #include "glite/lb/xml_parse.h"
 #include "glite/lb/mini_http.h"
-#include "glite/wms/tls/ssl_helpers/ssl_inits.h"
+#include "glite/wmsutils/tls/ssl_helpers/ssl_inits.h"
 
 
 #define dprintf(x) { if (debug) printf x; }

diff --git a/org.glite.lb.client/src/load.c b/org.glite.lb.client/src/load.c
index 514def0..79086b1 100644 (file)
--- a/org.glite.lb.client/src/load.c
+++ b/org.glite.lb.client/src/load.c
@@ -18,7 +18,7 @@
 #include "glite/lb/ulm_parse.h"
 #include "glite/lb/xml_parse.h"
 #include "glite/lb/mini_http.h"
-#include "glite/wms/tls/ssl_helpers/ssl_inits.h"
+#include "glite/wmsutils/tls/ssl_helpers/ssl_inits.h"
 
 #define dprintf(x) { if (debug) printf x; }
 

diff --git a/org.glite.lb.client/src/logevent.c.T b/org.glite.lb.client/src/logevent.c.T
index faa67c3..fc6e844 100644 (file)
--- a/org.glite.lb.client/src/logevent.c.T
+++ b/org.glite.lb.client/src/logevent.c.T
@@ -15,11 +15,11 @@
 
 #include <globus_common.h>
 
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/lb/notifid.h"
 #include "glite/lb/producer.h"
 #include "glite/lb/events.h"
-#include "glite/wms/tls/ssl_helpers/ssl_inits.h"
+#include "glite/wmsutils/tls/ssl_helpers/ssl_inits.h"
 
 #include "args.h"
 

diff --git a/org.glite.lb.client/src/producer.c b/org.glite.lb.client/src/producer.c
index e21b176..44fb814 100644 (file)
--- a/org.glite.lb.client/src/producer.c
+++ b/org.glite.lb.client/src/producer.c
@@ -13,8 +13,8 @@
 #include <unistd.h>
 #include <netdb.h>
 
-#include "glite/wms/thirdparty/globus_ssl_utils/sslutils.h"
-#include "glite/wms/jobid/strmd5.h"
+#include "glite/wmsutils/thirdparty/globus_ssl_utils/sslutils.h"
+#include "glite/wmsutils/jobid/strmd5.h"
 #include "glite/lb/consumer.h"
 #include "glite/lb/producer.h"
 #include "glite/lb/context-int.h"

diff --git a/org.glite.lb.client/src/purge.c b/org.glite.lb.client/src/purge.c
index 7d4ba32..3eff59b 100644 (file)
--- a/org.glite.lb.client/src/purge.c
+++ b/org.glite.lb.client/src/purge.c
@@ -12,7 +12,7 @@
 
 #define CLIENT_SBIN_PROG
 
-#include "glite/wms/tls/ssl_helpers/ssl_inits.h"
+#include "glite/wmsutils/tls/ssl_helpers/ssl_inits.h"
 #include "glite/lb/consumer.h"
 #include "glite/lb/context-int.h"
 #include "glite/lb/purge.h"

diff --git a/org.glite.lb.client/src/uiwrap.c.T b/org.glite.lb.client/src/uiwrap.c.T
index 1e01840..983a43b 100644 (file)
--- a/org.glite.lb.client/src/uiwrap.c.T
+++ b/org.glite.lb.client/src/uiwrap.c.T
@@ -4,7 +4,7 @@
 */
 @@@LANG: C
 
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/lb/producer.h"
 
 @@@{

diff --git a/org.glite.lb.common/interface/dgssl.h b/org.glite.lb.common/interface/dgssl.h
index 1de1ec4..dcb8036 100644 (file)
--- a/org.glite.lb.common/interface/dgssl.h
+++ b/org.glite.lb.common/interface/dgssl.h
@@ -9,7 +9,7 @@
 
 /* openssl headers */
 #include <globus_config.h>
-#include "glite/wms/thirdparty/globus_ssl_utils/sslutils.h"
+#include "glite/wmsutils/thirdparty/globus_ssl_utils/sslutils.h"
 
 #include <ssl.h>
 #include <err.h>

diff --git a/org.glite.lb.common/src/context.c b/org.glite.lb.common/src/context.c
index 407b852..a81644b 100644 (file)
--- a/org.glite.lb.common/src/context.c
+++ b/org.glite.lb.common/src/context.c
@@ -7,10 +7,10 @@
 #include <assert.h>
 
 #include <globus_config.h>
-#include "glite/wms/thirdparty/globus_ssl_utils/sslutils.h"
+#include "glite/wmsutils/thirdparty/globus_ssl_utils/sslutils.h"
 
-#include "glite/wms/jobid/strmd5.h"
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/strmd5.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 #include "context-int.h"
 #include "glite/lb/producer.h"
 

diff --git a/org.glite.lb.common/src/dgssl.c b/org.glite.lb.common/src/dgssl.c
index 1e109e7..51a55d3 100644 (file)
--- a/org.glite.lb.common/src/dgssl.c
+++ b/org.glite.lb.common/src/dgssl.c
@@ -14,7 +14,7 @@
 #include <ares.h>
 
 #include "globus_config.h"
-#include "glite/wms/thirdparty/globus_ssl_utils/sslutils.h"
+#include "glite/wmsutils/thirdparty/globus_ssl_utils/sslutils.h"
 
 #include "dgssl.h"
 

diff --git a/org.glite.lb.common/src/events.c.T b/org.glite.lb.common/src/events.c.T
index 2897e71..24a8c69 100644 (file)
--- a/org.glite.lb.common/src/events.c.T
+++ b/org.glite.lb.common/src/events.c.T
@@ -9,7 +9,7 @@
 #include <time.h>
 #include <errno.h>
 
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/lb/producer.h"
 #include "ulm_parse.h"
 

diff --git a/org.glite.lb.common/src/events_parse.c.T b/org.glite.lb.common/src/events_parse.c.T
index cda2546..87512b2 100644 (file)
--- a/org.glite.lb.common/src/events_parse.c.T
+++ b/org.glite.lb.common/src/events_parse.c.T
@@ -15,7 +15,7 @@
 #include "ulm_parse.h"
 #include "context-int.h"
 #include "escape.h"
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 
 #include "trio.h"
 

diff --git a/org.glite.lb.common/src/mini_http.c b/org.glite.lb.common/src/mini_http.c
index 722e246..4f0aceb 100644 (file)
--- a/org.glite.lb.common/src/mini_http.c
+++ b/org.glite.lb.common/src/mini_http.c
@@ -11,7 +11,7 @@
 #include <syslog.h>
 
 #include "globus_config.h"
-#include "glite/wms/thirdparty/globus_ssl_utils/sslutils.h"
+#include "glite/wmsutils/thirdparty/globus_ssl_utils/sslutils.h"
 
 #include "mini_http.h"
 #include "dgssl.h"

diff --git a/org.glite.lb.common/src/notifid.c b/org.glite.lb.common/src/notifid.c
index e69ba74..8a1d5fe 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/wms/jobid/cjobid.h"
+#include "glite/wmsutils/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 479f654..0f4ba51 100644 (file)
--- a/org.glite.lb.common/src/param.c
+++ b/org.glite.lb.common/src/param.c
@@ -6,7 +6,7 @@
 
 #include <globus_common.h>
 
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/lb/producer.h"
 #include "glite/lb/notification.h"
 #include "context-int.h"

diff --git a/org.glite.lb.common/src/query_rec.c b/org.glite.lb.common/src/query_rec.c
index c57b8f6..6abeb4f 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/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/lb/consumer.h"
 
 /*

diff --git a/org.glite.lb.common/src/xml_parse.c.T b/org.glite.lb.common/src/xml_parse.c.T
index 3d79dcc..e5c6bf8 100644 (file)
--- a/org.glite.lb.common/src/xml_parse.c.T
+++ b/org.glite.lb.common/src/xml_parse.c.T
@@ -8,11 +8,11 @@
 #include <expat.h>     // Expat header file
 
 #include "globus_config.h"
-#include "glite/wms/thirdparty/globus_ssl_utils/sslutils.h"
+#include "glite/wmsutils/thirdparty/globus_ssl_utils/sslutils.h"
 
 #include "trio.h"
 #include "glite/lb/producer.h"
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 
 #include "escape.h"
 #include "context-int.h"

diff --git a/org.glite.lb.logger/src/event_queue.c b/org.glite.lb.logger/src/event_queue.c
index f4b749e..2b12d65 100644 (file)
--- a/org.glite.lb.logger/src/event_queue.c
+++ b/org.glite.lb.logger/src/event_queue.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/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 d4f77c3..c4f95e4 100644 (file)
--- a/org.glite.lb.logger/src/il_master.c
+++ b/org.glite.lb.logger/src/il_master.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/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/interlogd.c b/org.glite.lb.logger/src/interlogd.c
index b91ab45..467043f 100644 (file)
--- a/org.glite.lb.logger/src/interlogd.c
+++ b/org.glite.lb.logger/src/interlogd.c
@@ -11,8 +11,8 @@
 
 #include <globus_common.h>
 
-#include "glite/wms/tls/ssl_helpers/ssl_inits.h"
-#include "glite/wms/tls/ssl_helpers/ssl_pthreads.h"
+#include "glite/wmsutils/tls/ssl_helpers/ssl_inits.h"
+#include "glite/wmsutils/tls/ssl_helpers/ssl_pthreads.h"
 #include "interlogd.h"
 #include "glite/lb/consumer.h"
 #include "glite/lb/dgssl.h"

diff --git a/org.glite.lb.logger/src/logd.c b/org.glite.lb.logger/src/logd.c
index 22af270..fd6f245 100644 (file)
--- a/org.glite.lb.logger/src/logd.c
+++ b/org.glite.lb.logger/src/logd.c
@@ -15,7 +15,7 @@
 
 #include "logd_proto.h"
 #include "glite/lb/consumer.h"
-#include "glite/wms/tls/ssl_helpers/ssl_inits.h"
+#include "glite/wmsutils/tls/ssl_helpers/ssl_inits.h"
 
 static const char rcsid[] = "@(#)$Id$";
 static int verbose = 0;

diff --git a/org.glite.lb.logger/src/send_event.c b/org.glite.lb.logger/src/send_event.c
index 179581b..1c24e3e 100644 (file)
--- 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/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/lb/il_string.h"
 #include "glite/lb/context.h"
 

diff --git a/org.glite.lb.server/src/bkindex.c b/org.glite.lb.server/src/bkindex.c
index 3c230ee..fe8014e 100644 (file)
--- a/org.glite.lb.server/src/bkindex.c
+++ b/org.glite.lb.server/src/bkindex.c
@@ -8,7 +8,7 @@
 #include <sysexits.h>
 #include <assert.h>
 
-#include "glite/wms/jobid/strmd5.h"
+#include "glite/wmsutils/jobid/strmd5.h"
 #include "glite/lb/consumer.h"
 #include "glite/lb/context-int.h"
 #include "index.h"

diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c
index bae5a04..d0b5e5d 100644 (file)
--- a/org.glite.lb.server/src/bkserverd.c
+++ b/org.glite.lb.server/src/bkserverd.c
@@ -30,7 +30,7 @@
 
 #include <globus_common.h>
 
-#include "glite/wms/tls/ssl_helpers/ssl_inits.h"
+#include "glite/wmsutils/tls/ssl_helpers/ssl_inits.h"
 #include "glite/lb/consumer.h"
 #include "glite/lb/purge.h"
 #include "glite/lb/context.h"

diff --git a/org.glite.lb.server/src/dump.c b/org.glite.lb.server/src/dump.c
index d3c5dd3..67ae95b 100644 (file)
--- a/org.glite.lb.server/src/dump.c
+++ b/org.glite.lb.server/src/dump.c
@@ -8,7 +8,7 @@
 #include <unistd.h>
 
 #include "glite/lb/trio.h"
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/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 5a6f97e..dcbe4f1 100644 (file)
--- a/org.glite.lb.server/src/jobstat_supp.c
+++ b/org.glite.lb.server/src/jobstat_supp.c
@@ -10,7 +10,7 @@
 #include <regex.h>
 #include <syslog.h>
 
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/lb/producer.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 c249f47..95539ad 100644 (file)
--- a/org.glite.lb.server/src/lb_authz.c
+++ b/org.glite.lb.server/src/lb_authz.c
@@ -12,8 +12,8 @@
 #include <libxml/parser.h> 
 #undef WITHOUT_TRIO
 
-#include "glite/wms/jobid/strmd5.h"
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/strmd5.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/lb/producer.h"
 #include "glite/lb/trio.h"
 #include "lb_authz.h"

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 3a42b20..13254e4 100644 (file)
--- 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 <ctype.h>
 #include <expat.h>
 
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 
 #include "glite/lb/consumer.h"
 #include "glite/lb/escape.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 caec4f8..c3e3233 100644 (file)
--- 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 <ctype.h>
 #include <expat.h>
 
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 
 #include "glite/lb/consumer.h"
 #include "glite/lb/escape.h"

diff --git a/org.glite.lb.server/src/lock.c b/org.glite.lb.server/src/lock.c
index a11e27c..70a817f 100644 (file)
--- a/org.glite.lb.server/src/lock.c
+++ b/org.glite.lb.server/src/lock.c
@@ -3,7 +3,7 @@
 #include <sys/sem.h>
 #include <errno.h>
 
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/lb/context-int.h"
 #include "lock.h"
 

diff --git a/org.glite.lb.server/src/notification.c b/org.glite.lb.server/src/notification.c
index 2ddbdaa..048176e 100644 (file)
--- a/org.glite.lb.server/src/notification.c
+++ b/org.glite.lb.server/src/notification.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "glite/wms/jobid/strmd5.h"
+#include "glite/wmsutils/jobid/strmd5.h"
 #include "glite/lb/trio.h"
 #include "glite/lb/context-int.h"
 #include "glite/lb/xml_parse.h"

diff --git a/org.glite.lb.server/src/query.c b/org.glite.lb.server/src/query.c
index a4da45a..d2f4b1b 100644 (file)
--- a/org.glite.lb.server/src/query.c
+++ b/org.glite.lb.server/src/query.c
@@ -7,7 +7,7 @@
 #include <time.h>
 #include <assert.h>
 
-#include "glite/wms/jobid/strmd5.h"
+#include "glite/wmsutils/jobid/strmd5.h"
 
 #include "glite/lb/consumer.h"
 #include "glite/lb/producer.h"

diff --git a/org.glite.lb.server/src/srv_purge.c b/org.glite.lb.server/src/srv_purge.c
index c7144b4..58a843d 100644 (file)
--- a/org.glite.lb.server/src/srv_purge.c
+++ b/org.glite.lb.server/src/srv_purge.c
@@ -10,7 +10,7 @@
 #include <time.h>
 #include <errno.h>
 
-#include "glite/wms/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 
 #include "glite/lb/trio.h"
 #include "glite/lb/context-int.h"

diff --git a/org.glite.lb.server/src/store.c.T b/org.glite.lb.server/src/store.c.T
index c71e33b..51989ee 100644 (file)
--- a/org.glite.lb.server/src/store.c.T
+++ b/org.glite.lb.server/src/store.c.T
@@ -19,8 +19,8 @@
 
 #include <globus_config.h>
 
-#include "glite/wms/thirdparty/globus_ssl_utils/sslutils.h"
-#include "glite/wms/jobid/strmd5.h"
+#include "glite/wmsutils/thirdparty/globus_ssl_utils/sslutils.h"
+#include "glite/wmsutils/jobid/strmd5.h"
 
 #include "glite/lb/events_parse.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 a3b2ca4..66448f0 100644 (file)
--- a/org.glite.lb.server/src/userjobs.c
+++ b/org.glite.lb.server/src/userjobs.c
@@ -5,8 +5,8 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "glite/wms/jobid/cjobid.h"
-#include "glite/wms/jobid/strmd5.h"
+#include "glite/wmsutils/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/strmd5.h"
 #include "glite/lb/context-int.h"
 #include "glite/lb/trio.h"