From bf668e6e26c70ba8fbe52c050d1c379f04d66dcd Mon Sep 17 00:00:00 2001 From: Elisabetta Ronchieri Date: Tue, 1 Jun 2004 13:52:35 +0000 Subject: [PATCH] Updated namespace for jobid. Changed glite::wms::common::jobid namespace in glite::wms::jobid --- org.glite.wms-utils.jobid/configure.ac | 5 ++- org.glite.wms-utils.jobid/src/Makefile.am | 5 +-- org.glite.wms-utils.jobid/src/jobid/JobId.cpp | 10 +++-- org.glite.wms-utils.jobid/src/jobid/JobId.h | 21 +++++++---- .../src/jobid/JobIdExceptions.cpp | 25 +++++++++---- .../src/jobid/JobIdExceptions.h | 20 +++++++--- org.glite.wms-utils.jobid/src/jobid/Makefile.am | 3 +- org.glite.wms-utils.jobid/src/jobid/cjobid.h | 2 +- .../src/jobid/jobid_namespace.h | 27 -------------- .../src/jobid/manipulation.cpp | 11 +++--- org.glite.wms-utils.jobid/src/jobid/manipulation.h | 18 ++++----- org.glite.wms-utils.jobid/src/jobid_namespace.h | 27 -------------- org.glite.wms-utils.jobid/test/testjobid.c | 43 ++++++++++++---------- 13 files changed, 94 insertions(+), 123 deletions(-) delete mode 100755 org.glite.wms-utils.jobid/src/jobid/jobid_namespace.h delete mode 100755 org.glite.wms-utils.jobid/src/jobid_namespace.h diff --git a/org.glite.wms-utils.jobid/configure.ac b/org.glite.wms-utils.jobid/configure.ac index 7378bf2..f28a384 100755 --- a/org.glite.wms-utils.jobid/configure.ac +++ b/org.glite.wms-utils.jobid/configure.ac @@ -19,6 +19,9 @@ # # Revision history: # $Log$ +# Revision 1.2 2004/05/31 14:03:30 eronchie +# Merged with code in the infnforge repository +# # Revision 1.1.1.1 2004/05/26 18:45:05 eronchie # Import of wms jobid # @@ -31,7 +34,7 @@ AC_PREREQ(2.57) AC_INIT([GLite WMS jobid], [0.0.0]) AC_CONFIG_AUX_DIR([./project]) AM_INIT_AUTOMAKE([1.6.3 subdir-objects]) -AC_CONFIG_SRCDIR([src/jobid_namespace.h]) +AC_CONFIG_SRCDIR([src/jobid/cjobid.h]) # Notices. AC_COPYRIGHT([Copyright (c) 2004 The EU EGEE Project diff --git a/org.glite.wms-utils.jobid/src/Makefile.am b/org.glite.wms-utils.jobid/src/Makefile.am index cac14fb..5225c64 100755 --- a/org.glite.wms-utils.jobid/src/Makefile.am +++ b/org.glite.wms-utils.jobid/src/Makefile.am @@ -7,9 +7,6 @@ ## ********************************************************************* ## Subdirectories list -SUBDIRS = jobid - -#jobid_includedir = $(includedir)/glite/workload/jobid -#jobid_include_HEADERS = jobid_namespace.h +SUBDIRS = jobid MAINTAINERCLEANFILES = Makefile.in diff --git a/org.glite.wms-utils.jobid/src/jobid/JobId.cpp b/org.glite.wms-utils.jobid/src/jobid/JobId.cpp index f4da626..91b5406 100755 --- a/org.glite.wms-utils.jobid/src/jobid/JobId.cpp +++ b/org.glite.wms-utils.jobid/src/jobid/JobId.cpp @@ -10,8 +10,10 @@ #include "JobIdExceptions.h" -COMMON_NAMESPACE_BEGIN{ -namespace jobid{ +namespace glite { +namespace wms { +namespace jobid { + using namespace std ; /****************************************************************** @@ -176,4 +178,6 @@ operator<<(std::ostream& os, JobId const& id) return os << id.toString(); } -} COMMON_NAMESPACE_END} +} // namespace jobid +} // namespace wms +} // namespace glite diff --git a/org.glite.wms-utils.jobid/src/jobid/JobId.h b/org.glite.wms-utils.jobid/src/jobid/JobId.h index d33e22e..752d467 100755 --- 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 GLITE_WMS_COMMON_CLIENT_JOBID_H -#define GLITE_WMS_COMMON_CLIENT_JOBID_H +#ifndef GLITE_WMS_JOBID_JOBID_H +#define GLITE_WMS_JOBID_JOBID_H /* * JobId.h @@ -10,12 +10,14 @@ #include #include -#include "jobid_namespace.h" #include "cjobid.h" typedef struct _edg_wlc_jobid_s* edg_wlc_jobid_t; -#define COMMON_JOBID_NAMESPACE_BEGIN namespace glite { namespace wms { namespace common {namespace jobid{ -COMMON_JOBID_NAMESPACE_BEGIN + +namespace glite { +namespace wms { +namespace jobid { + /** * Managing Identification, checking, retreiving info from a job * File name: JobId.h @@ -28,7 +30,8 @@ COMMON_JOBID_NAMESPACE_BEGIN * @version 0.1 * @date 15 April 2002 * @author Alessandro Maraschini */ - class JobId { + +class JobId { public: /**@name Constructors/Destructor */ //@{ @@ -110,6 +113,8 @@ return strcmp ( lhs.m_pStr , rhs.m_pStr ) ==0 ; std::ostream& operator<<(std::ostream& os, JobId const& id); -} COMMON_NAMESPACE_END } +} // namespace jobid +} // namespace wms +} // namespace glite -#endif // GLITE_WMS_COMMON_CLIENT_JOBID_H +#endif // GLITE_WMS_JOBID_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 663d215..07cbda9 100755 --- a/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.cpp +++ b/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.cpp @@ -6,8 +6,10 @@ #include "JobIdExceptions.h" -COMMON_NAMESPACE_BEGIN{ -namespace jobid{ +namespace glite { +namespace wms { +namespace jobid { + using namespace std; using namespace glite::wms::common::utilities; @@ -19,7 +21,10 @@ JobIdException::JobIdException (const string& file, const string& method, int code, const string& exception_name) - : Exception(file, line, method, code, exception_name){} + : Exception(file, line, method, code, exception_name) +{ +} + /***************************** * WrongIdException *****************************/ @@ -28,9 +33,11 @@ WrongIdException::WrongIdException(const string& file, const string& method, int code ) : JobIdException(file, line, method, code, - "WrongIdException"){ + "WrongIdException") +{ error_message = "Wrong Field caught while parsing Job Id" ; - }; +} + /***************************** * EmptyIdException *****************************/ @@ -41,9 +48,11 @@ EmptyIdException::EmptyIdException(const string& file, const string& field ) : JobIdException(file, line, method, code, "EmptyIdException") - { +{ error_message = "Unable to retrieve " + field + ": the instance has not been initialized yet"; - } +} -} COMMON_NAMESPACE_END } +} // namespace jobid +} // namespace wms +} // namespace glite diff --git a/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.h b/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.h index b3dd8cf..136f2b0 100755 --- a/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.h +++ b/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.h @@ -1,14 +1,17 @@ -#ifndef GLITE_WMS_COMMON_CLIENT_JOBIDEXCEPTIONS_H -#define GLITE_WMS_COMMON_CLIENT_JOBIDEXCEPTIONS_H +#ifndef GLITE_WMS_JOBID_EXCEPTIONS_H +#define GLITE_WMS_JOBID_EXCEPTIONS_H /* * JobIdExceptions.h * Copyright (c) 2001 The European Datagrid Project - IST programme, all rights reserved. */ + #include "glite/wms/common/utilities/Exceptions.h" -#define COMMON_JOBID_NAMESPACE_BEGIN namespace glite { namespace wms { namespace common {namespace jobid{ -COMMON_JOBID_NAMESPACE_BEGIN +namespace glite { +namespace wms { +namespace jobid { + /** * JobIdException - Exception thrown by JobId Class * @ingroup Common @@ -16,6 +19,7 @@ COMMON_JOBID_NAMESPACE_BEGIN * @date 15 April 2002 * @author Alessandro Maraschini */ + class JobIdException : public glite::wms::common::utilities::Exception { public: /** @@ -67,6 +71,10 @@ public: int code , const std::string& field ); }; //End CLass EmptyIdException -} COMMON_NAMESPACE_END } -#endif + +} // namespace jobid +} // namespace wms +} // namespace glite + +#endif // GLITE_WMS_JOBID_EXCEPTIONS_H diff --git a/org.glite.wms-utils.jobid/src/jobid/Makefile.am b/org.glite.wms-utils.jobid/src/jobid/Makefile.am index ebdc4b5..1214a8c 100755 --- a/org.glite.wms-utils.jobid/src/jobid/Makefile.am +++ b/org.glite.wms-utils.jobid/src/jobid/Makefile.am @@ -21,8 +21,7 @@ jobidinclude_HEADERS = \ JobIdExceptions.h \ cjobid.h \ manipulation.h \ - strmd5.h \ - jobid_namespace.h + strmd5.h AM_CPPFLAGS = -I$(top_srcdir)/.. \ $(GLITE_WORKLOAD_CFLAGS) \ diff --git a/org.glite.wms-utils.jobid/src/jobid/cjobid.h b/org.glite.wms-utils.jobid/src/jobid/cjobid.h index 2beb916..e8f84f5 100755 --- a/org.glite.wms-utils.jobid/src/jobid/cjobid.h +++ b/org.glite.wms-utils.jobid/src/jobid/cjobid.h @@ -2,7 +2,7 @@ #define _GLITE_JOBID_H /*! - * \file jobid/cjobid.h + * \file cjobid.h * \brief L&B consumer API */ diff --git a/org.glite.wms-utils.jobid/src/jobid/jobid_namespace.h b/org.glite.wms-utils.jobid/src/jobid/jobid_namespace.h deleted file mode 100755 index a2ff1a1..0000000 --- a/org.glite.wms-utils.jobid/src/jobid/jobid_namespace.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef __COMMON_NAMESPACE_H_LOADED -#define __COMMON_NAMESPACE_H_LOADED - -#define COMMON_NAMESPACE_BEGIN namespace glite { namespace wms { namespace common - -#define COMMON_NAMESPACE_END }} - -#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 glite { namespace wms { namespace common { \ - class Type; \ -}}} - -#define COMMON_SUBNAMESPACE_CLASS( Namespace, Type ) \ -namespace glite { namespace wms { namespace common { \ - namespace Namespace { \ - class Type; \ - } \ -}}} - -#endif /* __COMMON_NAMESPACE_H_LOADED */ - -// Local Variables: -// mode: c++ -// End: diff --git a/org.glite.wms-utils.jobid/src/jobid/manipulation.cpp b/org.glite.wms-utils.jobid/src/jobid/manipulation.cpp index 6de326d..ad6f1c1 100755 --- a/org.glite.wms-utils.jobid/src/jobid/manipulation.cpp +++ b/org.glite.wms-utils.jobid/src/jobid/manipulation.cpp @@ -3,13 +3,12 @@ #include #include -#include "jobid_namespace.h" #include "JobId.h" using namespace std; -COMMON_NAMESPACE_BEGIN { - +namespace glite { +namespace wms { namespace jobid { namespace { @@ -176,6 +175,6 @@ JobId from_filename( const string &filename ) return JobId( decoded ); } -}; // Namespace jobid - -} COMMON_NAMESPACE_END; +} // namespace jobid +} // namespace wms +} // namespace glite diff --git a/org.glite.wms-utils.jobid/src/jobid/manipulation.h b/org.glite.wms-utils.jobid/src/jobid/manipulation.h index cd54175..e9a0834 100755 --- a/org.glite.wms-utils.jobid/src/jobid/manipulation.h +++ b/org.glite.wms-utils.jobid/src/jobid/manipulation.h @@ -1,12 +1,10 @@ -#ifndef GLITE_WMS_COMMON_JOBID_MANIPULATION_H -#define GLITE_WMS_COMMON_JOBID_MANIPULATION_H +#ifndef GLITE_WMS_JOBID_MANIPULATION_H +#define GLITE_WMS_JOBID_MANIPULATION_H #include -#include "jobid_namespace.h" - -COMMON_NAMESPACE_BEGIN { - +namespace glite { +namespace wms { namespace jobid { class JobId; @@ -15,11 +13,11 @@ std::string get_reduced_part( const JobId &id, int level = 0 ); std::string to_filename( const JobId &id ); JobId from_filename( const std::string &filename ); -}; // Namespace jobid - -} COMMON_NAMESPACE_END; +} // namespace jobid +} // namespace wms +} // namespace glite -#endif /* GLITE_WMS_COMMON_JOBID_MANIPULATION_H */ +#endif /* GLITE_WMS_JOBID_MANIPULATION_H */ // Local Variables: // mode: c++ diff --git a/org.glite.wms-utils.jobid/src/jobid_namespace.h b/org.glite.wms-utils.jobid/src/jobid_namespace.h deleted file mode 100755 index e3e5f61..0000000 --- a/org.glite.wms-utils.jobid/src/jobid_namespace.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef __COMMON_NAMESPACE_H_LOADED -#define __COMMON_NAMESPACE_H_LOADED - -#define COMMON_NAMESPACE_BEGIN namespace edg { namespace workload { 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 COMMON_NAMESPACE_CLASS( Type ) \ -namespace edg { namespace workload { namespace common { \ - class Type; \ -}}} - -#define COMMON_SUBNAMESPACE_CLASS( Namespace, Type ) \ -namespace edg { namespace workload { namespace common { \ - namespace Namespace { \ - class Type; \ - } \ -}}} - -#endif /* __COMMON_NAMESPACE_H_LOADED */ - -// Local Variables: -// mode: c++ -// End: diff --git a/org.glite.wms-utils.jobid/test/testjobid.c b/org.glite.wms-utils.jobid/test/testjobid.c index 79cd1ce..e92c36a 100755 --- a/org.glite.wms-utils.jobid/test/testjobid.c +++ b/org.glite.wms-utils.jobid/test/testjobid.c @@ -7,24 +7,27 @@ int main(int argc, char* argv[]) { - char* ju; - char* bkserver = "ujsa.uhjs"; - edg_wlc_JobId ji = 0; - edg_wlc_JobId ji2 = 0; - int r = edg_wlc_JobIdCreate(bkserver, 0, &ji); - printf("Create: %d\n", r); - - ju = edg_wlc_JobIdUnparse(ji); - printf("Unparse: %s\n", ju); - - edg_wlc_JobIdParse(ju, &ji2); - free(ju); - - ju = edg_wlc_JobIdUnparse(ji); - printf("Unparse2: %s\n", ju); - free(ju); - - edg_wlc_JobIdFree(ji); - edg_wlc_JobIdFree(ji2); - return 0; + char* ju; + char* bkserver = "ujsa.uhjs"; + + edg_wlc_JobId ji = 0; + edg_wlc_JobId ji2 = 0; + + int r = edg_wlc_JobIdCreate(bkserver, 0, &ji); + printf("Create: %d\n", r); + + ju = edg_wlc_JobIdUnparse(ji); + printf("Unparse: %s\n", ju); + + edg_wlc_JobIdParse(ju, &ji2); + free(ju); + + ju = edg_wlc_JobIdUnparse(ji); + printf("Unparse2: %s\n", ju); + free(ju); + + edg_wlc_JobIdFree(ji); + edg_wlc_JobIdFree(ji2); + + return 0; } -- 1.8.2.3