Changed edg::workload namespace in glite::wms

Changed EDG_WORKLOAD def in GLITE_WMS
Changed EDG_WL in GLITE_WMS

diff --git a/org.glite.wms-utils.jobid/src/jobid/JobId.h b/org.glite.wms-utils.jobid/src/jobid/JobId.h
index 1dca8d4..b43aaf0 100755 (executable)
--- a/org.glite.wms-utils.jobid/src/jobid/JobId.h
+++ b/org.glite.wms-utils.jobid/src/jobid/JobId.h
@@ -1,5 +1,5 @@
-#ifndef EDG_WORKLOAD_COMMON_CLIENT_JOBID_H
-#define EDG_WORKLOAD_COMMON_CLIENT_JOBID_H
+#ifndef GLITE_WMS_COMMON_CLIENT_JOBID_H
+#define GLITE_WMS_COMMON_CLIENT_JOBID_H
 
 /*
  * JobId.h
@@ -14,7 +14,7 @@
 #include "jobid.h"
 
 typedef struct _edg_wlc_jobid_s* edg_wlc_jobid_t;
-#define COMMON_JOBID_NAMESPACE_BEGIN namespace edg { namespace workload { namespace common {namespace jobid{
+#define COMMON_JOBID_NAMESPACE_BEGIN namespace glite { namespace wms { namespace common {namespace jobid{
 COMMON_JOBID_NAMESPACE_BEGIN
 /**
  * Managing Identification, checking, retreiving info from a job
@@ -112,4 +112,4 @@ std::ostream& operator<<(std::ostream& os, JobId const& id);
 
 } COMMON_NAMESPACE_END }
 
-#endif // EDG_WORKLOAD_COMMON_CLIENT_JOBID_H
+#endif // GLITE_WMS_COMMON_CLIENT_JOBID_H

diff --git a/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.cpp b/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.cpp
index 06b12fc..663d215 100755 (executable)
--- a/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.cpp
+++ b/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.cpp
@@ -8,8 +8,9 @@
 
 COMMON_NAMESPACE_BEGIN{
 namespace jobid{
-using namespace std ;
-using namespace edg::workload::common::utilities ;
+using namespace std;
+using namespace glite::wms::common::utilities;
+
 /*****************************
 * JobIdException
 *****************************/

diff --git a/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.h b/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.h
index be0b053..b3dd8cf 100755 (executable)
--- a/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.h
+++ b/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.h
@@ -1,5 +1,5 @@
-#ifndef  EDG_WORKLOAD_COMMON_CLIENT_JOBIDEXCEPTIONS_H
-#define EDG_WORKLOAD_COMMON_CLIENT_JOBIDEXCEPTIONS_H
+#ifndef GLITE_WMS_COMMON_CLIENT_JOBIDEXCEPTIONS_H
+#define GLITE_WMS_COMMON_CLIENT_JOBIDEXCEPTIONS_H
 
 /*
  * JobIdExceptions.h
@@ -7,7 +7,7 @@
  */
 #include "glite/wms/common/utilities/Exceptions.h"
 
-#define COMMON_JOBID_NAMESPACE_BEGIN namespace edg { namespace workload { namespace common {namespace jobid{
+#define COMMON_JOBID_NAMESPACE_BEGIN namespace glite { namespace wms { namespace common {namespace jobid{
 COMMON_JOBID_NAMESPACE_BEGIN
 /**
  * JobIdException - Exception thrown by JobId Class
@@ -16,7 +16,7 @@ COMMON_JOBID_NAMESPACE_BEGIN
  * @date 15 April 2002
  * @author Alessandro Maraschini <alessandro.maraschini@datamat.it>
 */
-class JobIdException : public edg::workload::common::utilities::Exception {
+class JobIdException : public glite::wms::common::utilities::Exception {
 public:
     /**
      * Update all mandatory Exception Information

diff --git a/org.glite.wms-utils.jobid/src/jobid/jobid-c.h b/org.glite.wms-utils.jobid/src/jobid/jobid-c.h
index 005384d..47e54e5 100755 (executable)
--- a/org.glite.wms-utils.jobid/src/jobid/jobid-c.h
+++ b/org.glite.wms-utils.jobid/src/jobid/jobid-c.h
@@ -1,5 +1,5 @@
-#ifndef _EDG_JOBID_H
-#define _EDG_JOBID_H
+#ifndef _GLITE_JOBID_H
+#define _GLITE_JOBID_H
 
 /*!
  * \file common/jobid/jobid-c.h
@@ -14,8 +14,8 @@ extern "C" {
 
 typedef struct _edg_wlc_JobId *edg_wlc_JobId;
 
-#define EDG_WLC_JOBID_DEFAULT_PORT 9000 /**< Default port where bookkeeping server listens */
-#define EDG_WLC_JOBID_PROTO_PREFIX "https://" /**< JobId protocol prefix */
+#define GLITE_WMSC_JOBID_DEFAULT_PORT 9000 /**< Default port where bookkeeping server listens */
+#define GLITE_WMSC_JOBID_PROTO_PREFIX "https://" /**< JobId protocol prefix */
 
 
 /* All the pointer functions return malloc'ed objects (or NULL on error) */
@@ -106,4 +106,4 @@ char* edg_wlc_JobIdGetUnique(const edg_wlc_JobId jobid);
 }
 #endif
 
-#endif /* _EDG_JOBID_H */
+#endif /* _GLITE_JOBID_H */

diff --git a/org.glite.wms-utils.jobid/src/jobid/jobid.c b/org.glite.wms-utils.jobid/src/jobid/jobid.c
index 1434286..2ad11e5 100755 (executable)
--- a/org.glite.wms-utils.jobid/src/jobid/jobid.c
+++ b/org.glite.wms-utils.jobid/src/jobid/jobid.c
@@ -62,7 +62,7 @@ int edg_wlc_JobIdRecreate(const char* bkserver, int port, const char *unique, ed
 
     /* check if it begins with prefix */
     /* unsupported */
-    if (strncmp(bkserver, EDG_WLC_JOBID_PROTO_PREFIX, sizeof(EDG_WLC_JOBID_PROTO_PREFIX)-1) == 0)
+    if (strncmp(bkserver, GLITE_WMSC_JOBID_PROTO_PREFIX, sizeof(GLITE_WMSC_JOBID_PROTO_PREFIX)-1) == 0)
         return EINVAL;
 
     out->BShost = strdup(bkserver);
@@ -75,7 +75,7 @@ int edg_wlc_JobIdRecreate(const char* bkserver, int port, const char *unique, ed
     }
 
     if (port == 0)
-        port = EDG_WLC_JOBID_DEFAULT_PORT;
+        port = GLITE_WMSC_JOBID_DEFAULT_PORT;
 
     out->BSport = port;
 
@@ -136,7 +136,7 @@ int edg_wlc_JobIdParse(const char *idString, edg_wlc_JobId *jobId)
 
     memset(out,0,sizeof(*out));
 
-    if (strncmp(idString, EDG_WLC_JOBID_PROTO_PREFIX, sizeof(EDG_WLC_JOBID_PROTO_PREFIX) - 1)) {
+    if (strncmp(idString, GLITE_WMSC_JOBID_PROTO_PREFIX, sizeof(GLITE_WMSC_JOBID_PROTO_PREFIX) - 1)) {
        out->BShost  = (char *) NULL;
        out->BSport  = 0;
 
@@ -144,7 +144,7 @@ int edg_wlc_JobIdParse(const char *idString, edg_wlc_JobId *jobId)
        return EINVAL;
     }
 
-    pom = strdup(idString + sizeof(EDG_WLC_JOBID_PROTO_PREFIX) - 1);
+    pom = strdup(idString + sizeof(GLITE_WMSC_JOBID_PROTO_PREFIX) - 1);
     pom1 = strchr(pom, '/');
     pom2 = strchr(pom, ':');
 
@@ -158,7 +158,7 @@ int edg_wlc_JobIdParse(const char *idString, edg_wlc_JobId *jobId)
     } else {
        pom[pom1-pom]     = '\0';
        out->BShost  = strdup(pom);
-       out->BSport  = EDG_WLC_JOBID_DEFAULT_PORT;
+       out->BSport  = GLITE_WMSC_JOBID_DEFAULT_PORT;
     }
 
     /* XXX: localhost not supported in jobid 
@@ -221,7 +221,7 @@ char* edg_wlc_JobIdUnparse(const edg_wlc_JobId jobid)
     else
         *port = 0;
 
-    asprintf(&out,EDG_WLC_JOBID_PROTO_PREFIX"%s%s/%s%s%s",
+    asprintf(&out, GLITE_WMSC_JOBID_PROTO_PREFIX"%s%s/%s%s%s",
             jobid->BShost,port,
             jobid->id,
             (jobid->info ? "?" : ""),
@@ -237,7 +237,7 @@ char* edg_wlc_JobIdGetServer(const edg_wlc_JobId jobid)
 
     if (jobid)
        asprintf(&bs, "%s:%u", jobid->BShost,
-                jobid->BSport ? jobid->BSport : EDG_WLC_JOBID_DEFAULT_PORT);
+                jobid->BSport ? jobid->BSport : GLITE_WMSC_JOBID_DEFAULT_PORT);
 
     return bs;
 }
@@ -247,7 +247,7 @@ void edg_wlc_JobIdGetServerParts(const edg_wlc_JobId jobid, char **srvName, unsi
 {
     if (jobid) {
        *srvName = strdup(jobid->BShost);
-       *srvPort = jobid->BSport ? jobid->BSport : EDG_WLC_JOBID_DEFAULT_PORT;
+       *srvPort = jobid->BSport ? jobid->BSport : GLITE_WMSC_JOBID_DEFAULT_PORT;
     }
 }
 

diff --git a/org.glite.wms-utils.jobid/src/jobid/jobid.h b/org.glite.wms-utils.jobid/src/jobid/jobid.h
index 6f3e345..552b33f 100755 (executable)
--- a/org.glite.wms-utils.jobid/src/jobid/jobid.h
+++ b/org.glite.wms-utils.jobid/src/jobid/jobid.h
@@ -1,5 +1,5 @@
-#ifndef _EDG_JOBID_H
-#define _EDG_JOBID_H
+#ifndef _GLITE_JOBID_H
+#define _GLITE_JOBID_H
 
 /*!
  * \file jobid/jobid.h
@@ -14,8 +14,8 @@ extern "C" {
 
 typedef struct _edg_wlc_JobId *edg_wlc_JobId;
 
-#define EDG_WLC_JOBID_DEFAULT_PORT 9000 /**< Default port where bookkeeping server listens */
-#define EDG_WLC_JOBID_PROTO_PREFIX "https://" /**< JobId protocol prefix */
+#define GLITE_WMSC_JOBID_DEFAULT_PORT 9000 /**< Default port where bookkeeping server listens */
+#define GLITE_WMSC_JOBID_PROTO_PREFIX "https://" /**< JobId protocol prefix */
 
 
 /* All the pointer functions return malloc'ed objects (or NULL on error) */
@@ -106,4 +106,4 @@ char* edg_wlc_JobIdGetUnique(const edg_wlc_JobId jobid);
 }
 #endif
 
-#endif /* _EDG_JOBID_H */
+#endif /* _GLITE_JOBID_H */

diff --git a/org.glite.wms-utils.jobid/src/jobid/jobid_namespace.h b/org.glite.wms-utils.jobid/src/jobid/jobid_namespace.h
index e3e5f61..a2ff1a1 100755 (executable)
--- a/org.glite.wms-utils.jobid/src/jobid/jobid_namespace.h
+++ b/org.glite.wms-utils.jobid/src/jobid/jobid_namespace.h
@@ -1,20 +1,20 @@
 #ifndef __COMMON_NAMESPACE_H_LOADED
 #define __COMMON_NAMESPACE_H_LOADED
 
-#define COMMON_NAMESPACE_BEGIN namespace edg { namespace workload { namespace common
+#define COMMON_NAMESPACE_BEGIN namespace glite { namespace wms { namespace common
 
 #define COMMON_NAMESPACE_END }}
 
-#define USING_COMMON_NAMESPACE using namespace edg::workload::common
-#define USING_COMMON_NAMESPACE_ADD( last ) using namespace edg::workload::common::##last
+#define USING_COMMON_NAMESPACE using namespace glite::wms::common
+#define USING_COMMON_NAMESPACE_ADD( last ) using namespace glite::wms::common::##last
 
 #define COMMON_NAMESPACE_CLASS( Type )                  \
-namespace edg { namespace workload { namespace common { \
+namespace glite { namespace wms { namespace common { \
   class Type;                                           \
 }}}
 
 #define COMMON_SUBNAMESPACE_CLASS( Namespace, Type )    \
-namespace edg { namespace workload { namespace common { \
+namespace glite { namespace wms { namespace common { \
   namespace Namespace {                                 \
     class Type;                                         \
   }                                                     \

diff --git a/org.glite.wms-utils.jobid/src/jobid/manipulation.h b/org.glite.wms-utils.jobid/src/jobid/manipulation.h
index f0596c0..cd54175 100755 (executable)
--- a/org.glite.wms-utils.jobid/src/jobid/manipulation.h
+++ b/org.glite.wms-utils.jobid/src/jobid/manipulation.h
@@ -1,9 +1,9 @@
-#ifndef EDG_WORKLOAD_COMMON_JOBID_MANIPULATION_H
-#define EDG_WORKLOAD_COMMON_JOBID_MANIPULATION_H
+#ifndef GLITE_WMS_COMMON_JOBID_MANIPULATION_H
+#define GLITE_WMS_COMMON_JOBID_MANIPULATION_H
 
 #include <string>
 
-#include "edg/workload/common/common_namespace.h"
+#include "jobid_namespace.h"
 
 COMMON_NAMESPACE_BEGIN {
 
@@ -19,7 +19,7 @@ JobId from_filename( const std::string &filename );
 
 } COMMON_NAMESPACE_END;
 
-#endif /* EDG_WORKLOAD_COMMON_JOBID_MANIPULATION_H */
+#endif /* GLITE_WMS_COMMON_JOBID_MANIPULATION_H */
 
 // Local Variables:
 // mode: c++

diff --git a/org.glite.wms-utils.jobid/src/jobid/strmd5.h b/org.glite.wms-utils.jobid/src/jobid/strmd5.h
index d453857..c5d76b6 100755 (executable)
--- a/org.glite.wms-utils.jobid/src/jobid/strmd5.h
+++ b/org.glite.wms-utils.jobid/src/jobid/strmd5.h
@@ -1,5 +1,5 @@
-#ifndef _EDG_STRMD5_H
-#define _EDG_STRMD5_H
+#ifndef _GLITE_STRMD5_H
+#define _GLITE_STRMD5_H
 
 #ident "$Header$"
 
@@ -25,4 +25,4 @@ char *str2md5(const char *src);
  */
 char *str2md5base64(const char *src);
 
-#endif /* _EDG_STRMD5_H */
+#endif /* _GLITE_STRMD5_H */