From: Elisabetta Ronchieri <elisabetta.ronchieri@cnaf.infn.it>
Date: Tue, 20 Sep 2005 10:41:49 +0000 (+0000)
Subject: Started merging with rc1.4
X-Git-Tag: merge_rc1_dst_2~27
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=3ba565848dce934f57634eb4413be8b24824ff43;p=jra1mw.git

Started merging with rc1.4
---

diff --git a/org.glite.wms-utils.jobid/configure.ac b/org.glite.wms-utils.jobid/configure.ac
index 0f1deb4..a9512cf 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.16  2004/12/10 07:33:42  eronchie
+#       Increased version
+#
 #       Revision 1.15  2004/11/16 15:35:22  eronchie
 #       Increased version
 #
@@ -54,7 +57,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([GLite WMS Utils Jobid], [1.0.0])
+AC_INIT([GLite WMS Utils Jobid], [1.0.1])
 AC_CONFIG_AUX_DIR([./project])
 AM_INIT_AUTOMAKE([1.6.3 subdir-objects])
 AC_CONFIG_SRCDIR([src/jobid/strmd5.h])
@@ -103,15 +106,22 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([bzero endpwent ftruncate getmntent memset mkdir pow strerror strtol])
 
 have_globus=no
-                                                                                
+
 AC_GLOBUS([], have_globus=yes, have_globus=no)
 AC_MSG_RESULT(["GLOBUS found $have_globus"])
 
-have_glite_wmsutils_exception=no
-                                                                                
+if test "$have_globus" = "no"; then
+  AC_MSG_RESULT(["Please verify GLOBUS package"])
+fi
+
+if test "$have_globus" = "no"; then
+  AC_MSG_ERROR([Cannot continue building])
+fi                                                                                
 AC_GLITE
 
-GLITE_WMSUTILS_EXCEPTION_LIBS="-L$GLITE_LOCATION/lib -lglite_wmsutils_exception"AC_SUBST(GLITE_WMSUTILS_EXCEPTION_LIBS)
+GLITE_WMSUTILS_EXCEPTION_LIBS="-L$GLITE_LOCATION/lib -lglite_wmsutils_exception"
+
+AC_SUBST(GLITE_WMSUTILS_EXCEPTION_LIBS)
 
 AC_OPTIMIZE
 
diff --git a/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/JobId.h b/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/JobId.h
index b0d07ce..8d0b7b4 100755
--- a/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/JobId.h
+++ b/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/JobId.h
@@ -39,22 +39,12 @@ public:
     JobId() ;
     /**
      * Instantiates a JobId object from the passed dg_jobId in string format.
-     * @param  jobid a string representig a classAd expression
+     * @param  job_id_string a string representig a classAd expression
      * @throws  WrongIdException When a string is passed in a wrong format
      */
-    JobId(const std::string& jobid ) ;
-    /**
-     * Instantiates a JobId object from the passed JobId instance
-     * @param jobid a JobId instance to copy from
-     * @throws  WrongIdException When a string is passed in a wrong format
-     */
-    JobId(const JobId& jobid );
-    /**
-     * Instantiates a JobId object from the passed  JobId internal reference
-     * @param  jobid the JobId internal reference
-     * @throws  WrongIdException When a string is passed in a wrong format
-     */
-    JobId(const edg_wlc_JobId& jobid);
+    JobId(const std::string& job_id_string);
+    JobId(const JobId&);
+    JobId(const edg_wlc_JobId&);
     /**
      * Destructor
      * Destroy the Job Id instance
diff --git a/org.glite.wms-utils.jobid/project/version.properties b/org.glite.wms-utils.jobid/project/version.properties
index cd1e9e7..e575ad0 100755
--- a/org.glite.wms-utils.jobid/project/version.properties
+++ b/org.glite.wms-utils.jobid/project/version.properties
@@ -1,2 +1,2 @@
-module.version=1.0.0
+module.version=1.0.1
 module.age=1