From ea473e1c5e1f76cf9c91b5f5e2baebd7292ccfe9 Mon Sep 17 00:00:00 2001
From: Elisabetta Ronchieri <elisabetta.ronchieri@cnaf.infn.it>
Date: Wed, 21 Jul 2004 17:53:37 +0000
Subject: [PATCH] Moved out org.glite.wms.jobid from org.glite.wms and put in
 org.glite.wms-utils

---
 org.glite.wms-utils.jobid/Makefile.am              |  2 +-
 org.glite.wms-utils.jobid/build.xml                |  9 +------
 org.glite.wms-utils.jobid/configure.ac             | 28 ++++------------------
 .../{test => examples}/Makefile.am                 |  4 ++--
 .../{test => examples}/testjobid.c                 |  0
 org.glite.wms-utils.jobid/src/jobid/JobId.cpp      |  4 ++--
 org.glite.wms-utils.jobid/src/jobid/JobId.h        | 10 ++++----
 .../src/jobid/JobIdExceptions.cpp                  |  6 ++---
 .../src/jobid/JobIdExceptions.h                    | 14 +++++------
 org.glite.wms-utils.jobid/src/jobid/Makefile.am    |  8 +++----
 .../src/jobid/manipulation.cpp                     |  4 ++--
 org.glite.wms-utils.jobid/src/jobid/manipulation.h | 10 ++++----
 12 files changed, 37 insertions(+), 62 deletions(-)
 rename org.glite.wms-utils.jobid/{test => examples}/Makefile.am (85%)
 rename org.glite.wms-utils.jobid/{test => examples}/testjobid.c (100%)

diff --git a/org.glite.wms-utils.jobid/Makefile.am b/org.glite.wms-utils.jobid/Makefile.am
index 11f1f7d..7bda98d 100755
--- a/org.glite.wms-utils.jobid/Makefile.am
+++ b/org.glite.wms-utils.jobid/Makefile.am
@@ -9,7 +9,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Subdirectories list
-SUBDIRS = src test 
+SUBDIRS = src examples 
 
 ## Default flags to run aclocal
 ACLOCAL_AMFLAGS = -I project
diff --git a/org.glite.wms-utils.jobid/build.xml b/org.glite.wms-utils.jobid/build.xml
index 4235ff2..220b2a6 100755
--- a/org.glite.wms-utils.jobid/build.xml
+++ b/org.glite.wms-utils.jobid/build.xml
@@ -21,20 +21,13 @@
 
 	Revision history:
 	$Log$
-	Revision 1.2  2004/06/14 18:14:35  eronchie
-	Added Configure options
-	WARNING work in progress
-	
-	Revision 1.1.1.1  2004/05/26 18:45:05  eronchie
-	Import of wms jobid
-	
 
 -->
 
 <project name="jobid" default="dist">
 	
 	<!-- =========================================
-		 Builds the GLite WMS jobid Module
+		 Builds the GLite WMS Utils Jobid Module
 	     ========================================= -->
 	
 	<!-- =========================================
diff --git a/org.glite.wms-utils.jobid/configure.ac b/org.glite.wms-utils.jobid/configure.ac
index cb309c7..c43ae6c 100755
--- a/org.glite.wms-utils.jobid/configure.ac
+++ b/org.glite.wms-utils.jobid/configure.ac
@@ -19,31 +19,13 @@
 #
 #       Revision history:
 #       $Log$
-#       Revision 1.5  2004/06/16 11:02:05  eronchie
-#       Added configure options
-#       WARNING: Work in progress
-#
-#       Revision 1.4  2004/06/14 18:14:35  eronchie
-#       Added Configure options
-#       WARNING work in progress
-#
-#       Revision 1.3  2004/06/01 13:52:35  eronchie
-#       Updated namespace for jobid.
-#       Changed glite::wms::common::jobid namespace in glite::wms::jobid
-#
-#       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
-#
 #
 #
                                                                                                                                                              
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([GLite WMS jobid], [0.0.0])
+AC_INIT([GLite WMS Utils Jobid], [0.0.0])
 AC_CONFIG_AUX_DIR([./project])
 AM_INIT_AUTOMAKE([1.6.3 subdir-objects])
 AC_CONFIG_SRCDIR([src/jobid/cjobid.h])
@@ -96,19 +78,19 @@ have_globus=no
 AC_GLOBUS([], have_globus=yes, have_globus=no)
 AC_MSG_RESULT(["GLOBUS found $have_globus"])
 
-have_glite_wms_common=no
+have_glite_wmsutils_exception=no
                                                                                 
 AC_GLITE
                                                                                 
-AC_GLITE_WMS_COMMON([], have_glite_wms_common=yes, have_glite_wms_common=no)
-AC_MSG_RESULT(["GLITE_WMS_COMMON found $have_glite_wms_common"])
+AC_GLITE_WMSUTILS_EXCEPTION([], have_glite_wmsutils_exception=yes, have_glite_wmsutils_exception=no)
+AC_MSG_RESULT(["GLITE_WMSUTILS_EXCEPTION found $have_glite_wmsutils_exception"])
 
 # Configuration items
 AC_PREFIX_DEFAULT([/opt/glite])
 AM_CONFIG_HEADER([src/autogen/config.h])
 AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([examples/Makefile])
 AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([src/jobid/Makefile])
-AC_CONFIG_FILES([test/Makefile])
 
 AC_OUTPUT
diff --git a/org.glite.wms-utils.jobid/test/Makefile.am b/org.glite.wms-utils.jobid/examples/Makefile.am
similarity index 85%
rename from org.glite.wms-utils.jobid/test/Makefile.am
rename to org.glite.wms-utils.jobid/examples/Makefile.am
index f0a40a7..a71171b 100755
--- a/org.glite.wms-utils.jobid/test/Makefile.am
+++ b/org.glite.wms-utils.jobid/examples/Makefile.am
@@ -8,14 +8,14 @@
 
 STDCPP = -lstdc++
 
-JOBID = $(top_builddir)/src/jobid/libglite_wms_cjobid.la
+JOBID = $(top_builddir)/src/jobid/libglite_wmsutils_cjobid.la
 
 check_PROGRAMS = testjobid 
 
 testjobid_SOURCES = testjobid.c
 testjobid_LDADD = \
 	$(JOBID) \
-	$(GLITE_WMS_COMMON_UT_EXCEPTIONS_LIBS) \
+	$(GLITE_WMSUTILS_EXCEPTIONS_LIBS) \
 	$(GLOBUS_SSL_THR_LIBS) \
 	$(STDCPP)
 
diff --git a/org.glite.wms-utils.jobid/test/testjobid.c b/org.glite.wms-utils.jobid/examples/testjobid.c
similarity index 100%
rename from org.glite.wms-utils.jobid/test/testjobid.c
rename to org.glite.wms-utils.jobid/examples/testjobid.c
diff --git a/org.glite.wms-utils.jobid/src/jobid/JobId.cpp b/org.glite.wms-utils.jobid/src/jobid/JobId.cpp
index 91b5406..6bba755 100755
--- a/org.glite.wms-utils.jobid/src/jobid/JobId.cpp
+++ b/org.glite.wms-utils.jobid/src/jobid/JobId.cpp
@@ -11,7 +11,7 @@
 #include "JobIdExceptions.h"
 
 namespace glite {
-namespace wms {
+namespace wmsutils {
 namespace jobid {
 
 using namespace std ;
@@ -179,5 +179,5 @@ operator<<(std::ostream& os, JobId const& id)
 }
 
 } // namespace jobid
-} // namespace wms
+} // namespace wmsutils
 } // 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 752d467..a89b9c4 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_JOBID_JOBID_H
-#define GLITE_WMS_JOBID_JOBID_H
+#ifndef GLITE_WMSUTILS_JOBID_JOBID_H
+#define GLITE_WMSUTILS_JOBID_JOBID_H
 
 /*
  * JobId.h
@@ -15,7 +15,7 @@
 typedef struct _edg_wlc_jobid_s* edg_wlc_jobid_t;
 
 namespace glite { 
-namespace wms { 
+namespace wmsutils { 
 namespace jobid {
 
 /**
@@ -114,7 +114,7 @@ return     strcmp ( lhs.m_pStr , rhs.m_pStr ) ==0 ;
 std::ostream& operator<<(std::ostream& os, JobId const& id);
 
 } // namespace jobid
-} // namespace wms
+} // namespace wmsutils
 } // namespace glite
 
-#endif // GLITE_WMS_JOBID_JOBID_H
+#endif // GLITE_WMSUTILS_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 07cbda9..1c1fb19 100755
--- a/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.cpp
+++ b/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.cpp
@@ -7,11 +7,11 @@
 #include "JobIdExceptions.h"
 
 namespace glite {
-namespace wms {
+namespace wmsutils {
 namespace jobid {
 
 using namespace std;
-using namespace glite::wms::common::utilities;
+using namespace glite::wmsutils::exception;
 
 /*****************************
 * JobIdException
@@ -53,6 +53,6 @@ EmptyIdException::EmptyIdException(const string& file,
 }
 
 } // namespace jobid
-} // namespace wms
+} // namespace wmsutils
 } // 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 136f2b0..9f3030c 100755
--- a/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.h
+++ b/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.h
@@ -1,15 +1,15 @@
-#ifndef GLITE_WMS_JOBID_EXCEPTIONS_H
-#define GLITE_WMS_JOBID_EXCEPTIONS_H
+#ifndef GLITE_WMSUTILS_JOBID_EXCEPTIONS_H
+#define GLITE_WMSUTILS_JOBID_EXCEPTIONS_H
 
 /*
  * JobIdExceptions.h
  * Copyright (c) 2001 The European Datagrid Project - IST programme, all rights reserved.
  */
 
-#include "glite/wms/common/utilities/Exceptions.h"
+#include "glite/wmsutils/exception/Exceptions.h"
 
 namespace glite { 
-namespace wms { 
+namespace wmsutils { 
 namespace jobid {
 
 /**
@@ -20,7 +20,7 @@ namespace jobid {
  * @author Alessandro Maraschini <alessandro.maraschini@datamat.it>
 */
 
-class JobIdException : public glite::wms::common::utilities::Exception {
+class JobIdException : public glite::wmsutils::exception::Exception {
 public:
     /**
      * Update all mandatory Exception Information
@@ -73,8 +73,8 @@ public:
 }; //End CLass EmptyIdException
 
 } // namespace jobid
-} // namespace wms
+} // namespace wmsutils
 } // namespace glite
 
-#endif // GLITE_WMS_JOBID_EXCEPTIONS_H
+#endif // GLITE_WMSUTILS_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 28c57b9..7bf3d08 100755
--- a/org.glite.wms-utils.jobid/src/jobid/Makefile.am
+++ b/org.glite.wms-utils.jobid/src/jobid/Makefile.am
@@ -6,18 +6,18 @@
 ## *
 ## *********************************************************************
 
-lib_LTLIBRARIES = libglite_wms_jobid.la libglite_wms_cjobid.la
+lib_LTLIBRARIES = libglite_wmsutils_jobid.la libglite_wmsutils_cjobid.la
 
-libglite_wms_jobid_la_SOURCES = \
+libglite_wmsutils_jobid_la_SOURCES = \
 	JobId.cpp \
 	JobIdExceptions.cpp \
 	manipulation.cpp 
 
-libglite_wms_cjobid_la_SOURCES = \
+libglite_wmsutils_cjobid_la_SOURCES = \
         cjobid.c \
         strmd5.c
 
-jobidincludedir = $(includedir)/glite/wms/jobid
+jobidincludedir = $(includedir)/glite/wmsutils/jobid
 jobidinclude_HEADERS = \
 	JobId.h \
 	JobIdExceptions.h \
diff --git a/org.glite.wms-utils.jobid/src/jobid/manipulation.cpp b/org.glite.wms-utils.jobid/src/jobid/manipulation.cpp
index ad6f1c1..4df8420 100755
--- a/org.glite.wms-utils.jobid/src/jobid/manipulation.cpp
+++ b/org.glite.wms-utils.jobid/src/jobid/manipulation.cpp
@@ -8,7 +8,7 @@
 using namespace std;
 
 namespace glite {
-namespace wms {
+namespace wmsutils {
 namespace jobid {
 
 namespace {
@@ -176,5 +176,5 @@ JobId from_filename( const string &filename )
 }
 
 } // namespace jobid
-} // namespace wms
+} // namespace wmsutils
 } // 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 e9a0834..9f862ae 100755
--- a/org.glite.wms-utils.jobid/src/jobid/manipulation.h
+++ b/org.glite.wms-utils.jobid/src/jobid/manipulation.h
@@ -1,10 +1,10 @@
-#ifndef GLITE_WMS_JOBID_MANIPULATION_H
-#define GLITE_WMS_JOBID_MANIPULATION_H
+#ifndef GLITE_WMSUTILS_JOBID_MANIPULATION_H
+#define GLITE_WMSUTILS_JOBID_MANIPULATION_H
 
 #include <string>
 
 namespace glite {
-namespace wms {
+namespace wmsutils {
 namespace jobid {
 
 class JobId;
@@ -14,10 +14,10 @@ std::string to_filename( const JobId &id );
 JobId from_filename( const std::string &filename );
 
 } // namespace jobid
-} // namespace wms
+} // namespace wmsutils
 } // namespace glite
 
-#endif /* GLITE_WMS_JOBID_MANIPULATION_H */
+#endif /* GLITE_WMSUTILS_JOBID_MANIPULATION_H */
 
 // Local Variables:
 // mode: c++
-- 
1.8.2.3