From b5135daefd50920dea5bed0462219139125904a1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Wed, 16 Jun 2010 12:58:50 +0000 Subject: [PATCH] Merge from branch_2_0. --- org.glite.lb.client/Makefile | 3 +- org.glite.lb.client/configure | 28 ++++-- org.glite.lb.client/examples/gen_begin | 4 +- org.glite.lb.client/m4/glite_lb_client.m4 | 129 -------------------------- org.glite.lb.client/project/ChangeLog | 13 +++ org.glite.lb.common/configure | 4 +- org.glite.lb.common/project/ChangeLog | 8 ++ org.glite.lb.doc/configure | 2 +- org.glite.lb.doc/project/ChangeLog | 4 + org.glite.lb.logger/configure | 4 +- org.glite.lb.logger/project/ChangeLog | 9 ++ org.glite.lb.logger/src/event_queue.c | 5 + org.glite.lb.server/config/startup | 4 +- org.glite.lb.server/configure | 2 +- org.glite.lb.server/project/ChangeLog | 27 ++++-- org.glite.lb.server/src/jobstat.c | 2 +- org.glite.lb.types/configure | 26 ++++-- org.glite.lb.types/project/ChangeLog | 2 + org.glite.lb.types/project/version.properties | 1 + org.glite.lb.ws-test/configure | 2 +- org.glite.lb.ws-test/project/ChangeLog | 4 +- 21 files changed, 115 insertions(+), 168 deletions(-) delete mode 100755 org.glite.lb.client/m4/glite_lb_client.m4 diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile index bc281eb..d6d2a52 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -346,8 +346,7 @@ endif ${INSTALL} -m 755 ${top_srcdir}/examples/sandbox_transfers.sh ${PREFIX}/examples/glite-lb-sandbox_transfers.sh ${INSTALL} -m 644 ${MAN_GZ} ${PREFIX}/share/man/man1 ${INSTALL} -m 644 ${MAN8_GZ} ${PREFIX}/share/man/man8 - sed "s/%LIBDIR%/${libdir}/" ${top_srcdir}/m4/glite_lb.m4 > glite_lb.m4 - ${INSTALL} -m 644 glite_lb.m4 ${PREFIX}/share/build/m4/ + ${INSTALL} -m 644 ${top_srcdir}/m4/glite_lb.m4 ${PREFIX}/share/build/m4/ clean: rm -rvf *.o *.lo .libs lib* *.c *.cpp *.h *.dox producer_test notify C/ CPP/ diff --git a/org.glite.lb.client/configure b/org.glite.lb.client/configure index a26cf89..c82ed75 100755 --- a/org.glite.lb.client/configure +++ b/org.glite.lb.client/configure @@ -327,15 +327,15 @@ BEGIN{ 'lb.ws-interface' => [], 'lb.ws-test' => [ qw/gsoap:B/ ], 'lb.types' => [ qw// ], - 'lb.harvester' => [ qw/postgresql:R/ ], - 'lb.yaim' => [ qw/glite-yaim-core:R/ ], + 'lb.harvester' => [ qw// ], + 'lb.yaim' => [ qw/yaim_core:R/ ], 'lb.glite-LB' => [ qw/fetchcrl:R gpt:R gip_release:R gip_service:R bdii:R glite_version:R glite_info_templates:R glue_schema:R/ ], - 'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ], + 'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B cppunit:B log4c:B/ ], 'lbjp-common.log' => [ qw/log4c/ ], 'lbjp-common.maildir' => [ qw// ], 'lbjp-common.server-bones' => [ qw// ], 'lbjp-common.trio' => [ qw/cppunit:B/ ], - 'lbjp-common.jp-interface' => [ qw/cppunit:B/ ], + 'lbjp-common.jp-interface' => [ qw/cppunit:B log4c:B/ ], 'security.gss' => [ qw/globus_essentials:R globus:B cares cppunit:B/ ], 'security.gsoap-plugin' => [ qw/cppunit:B globus_essentials:R globus:B cares:B gsoap:B/ ], 'jobid.api-c' => [ qw/cppunit:B/ ], @@ -416,7 +416,7 @@ for my $jar (keys %need_jars) { 'lb.yaim' => [ qw// ], 'lb.glite-LB' => [ qw/ lb.logger:R lb.server:R lb.utils:R lb.doc:R - lb.ws-test:R lb.harvester:R lb.yaim:R + lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R / ], 'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ], 'lbjp-common.maildir' => [ qw// ], @@ -475,6 +475,10 @@ for my $ext (keys %deps_aux) { jpclient => 'jp.client', ); +%obsoletes = ( + 'lb.yaim' => [ qq/glite-yaim-lb/ ], +); + my @t = qw/lb.client-java jobid.api-java lb.types/; @topbuild{@t} = (1) x ($#t+1); } @@ -490,7 +494,7 @@ sub mkinc my %aux; undef %aux; my @m=qw/ -lb.client lb.doc lb.state-machine lb.ws-interface lb.logger lb.types lb.common lb.server lb.utils lb.ws-test lb.client-java lb.harvester lb.yaim +lb.client lb.doc lb.state-machine lb.ws-interface lb.logger lb.types lb.common lb.server lb.utils lb.ws-test lb.client-java lb.harvester lb.yaim lb.glite-LB security.gss security.gsoap-plugin jobid.api-c jobid.api-cpp jobid.api-java lbjp-common.db lbjp-common.log lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface @@ -566,10 +570,11 @@ BEGIN{ glite_version=>'glite-version', glite_info_templates=>'glite-info-templates', glue_schema=>'glue-schema', + yaim_core=>'org.glite.yaim.core', ); %etics_projects = ( vdt=>[qw/globus globus_essentials/], - 'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema/], + 'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/], ); }; @@ -694,16 +699,21 @@ init = None install = make install clean = make clean test = make check -configure = cd $confdir && \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts +configure = cd $confdir && /usr/bin/perl \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts checkstyle = None [Platform-default:Property] $buildroot $package_description $package_summary +}; + for (@{$obsoletes{"$subsys.$module"}}) { + print C "package.obsoletes = $_\n"; + print C "package.replaces = $_\n"; + } + print C qq{ [Platform-default:DynamicDependency] - }; for (@{$need_externs{"$subsys.$module"}},@{$need_jars{"$subsys.$module"}}) { my $eext = $etics_externs{$_} ? $etics_externs{$_} : $_; diff --git a/org.glite.lb.client/examples/gen_begin b/org.glite.lb.client/examples/gen_begin index 6e7cb13..feb13c2 100755 --- a/org.glite.lb.client/examples/gen_begin +++ b/org.glite.lb.client/examples/gen_begin @@ -9,13 +9,13 @@ # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# + if test ! -z "$FAKE"; then SUFFIX="_fake" diff --git a/org.glite.lb.client/m4/glite_lb_client.m4 b/org.glite.lb.client/m4/glite_lb_client.m4 deleted file mode 100755 index f04dca8..0000000 --- a/org.glite.lb.client/m4/glite_lb_client.m4 +++ /dev/null @@ -1,129 +0,0 @@ -dnl Usage: -dnl AC_GLITE_LB -dnl - GLITE_LB_THR_CLIENT_LIBS -dnl - GLITE_LB_THR_CLIENTPP_LIBS -dnl - GLITE_LB_THR_COMMON_LIBS -dnl - GLITE_LB_NOTHR_CLIENT_LIBS -dnl - GLITE_LB_NOTHR_CLIENTPP_LIBS -dnl - GLITE_LB_NOTHR_COMMON_LIBS -dnl - GLITE_STATIC_LB_NOTHR_CLIENT_LIBS -dnl - GLITE_STATIC_LB_NOTHR_COMMON_LIBS - -AC_DEFUN([AC_GLITE_LB], -[ - ac_glite_lb_prefix=$GLITE_LOCATION - - AC_SEC_GSOAP_PLUGIN - - if test -n "ac_glite_lb_prefix" ; then - dnl - dnl - dnl - ac_glite_lb_lib="-L$ac_glite_lb_prefix/%LIBDIR%" - GLITE_LB_THR_CLIENT_LIBS="$ac_glite_lb_lib -lglite_lb_client_$GLOBUS_THR_FLAVOR" - GLITE_LB_THR_CLIENTPP_LIBS="$ac_glite_lb_lib -lglite_lb_clientpp_$GLOBUS_THR_FLAVOR" - GLITE_LB_THR_COMMON_LIBS="$ac_glite_lb_lib -lglite_lb_common_$GLOBUS_THR_FLAVOR $SEC_GSOAP_PLUGIN_GSS_THR_LIBS" - GLITE_LB_NOTHR_CLIENT_LIBS="$ac_glite_lb_lib -lglite_lb_client_$GLOBUS_NOTHR_FLAVOR" - GLITE_LB_NOTHR_CLIENTPP_LIBS="$ac_glite_lb_lib -lglite_lb_clientpp_$GLOBUS_NOTHR_FLAVOR" - GLITE_LB_NOTHR_COMMON_LIBS="$ac_glite_lb_lib -lglite_lb_common_$GLOBUS_NOTHR_FLAVOR $SEC_GSOAP_PLUGIN_GSS_NOTHR_LIBS" - GLITE_STATIC_LB_NOTHR_CLIENT_LIBS="$ac_glite_lb_prefix/%LIBDIR%/libglite_lb_client_$GLOBUS_NOTHR_FLAVOR.a" - GLITE_STATIC_LB_NOTHR_COMMON_LIBS="$ac_glite_lb_prefix/%LIBDIR%/libglite_lb_common_$GLOBUS_NOTHR_FLAVOR.a $SEC_GSOAP_PLUGIN_GSS_STATIC_NOTHR_LIBS" - ifelse([$2], , :, [$2]) - else - GLITE_LB_THR_CLIENT_LIBS="" - GLITE_LB_THR_CLIENTPP_LIBS="" - GLITE_LB_THR_COMMON_LIBS="" - GLITE_LB_NOTHR_CLIENT_LIBS="" - GLITE_LB_NOTHR_CLIENTPP_LIBS="" - GLITE_LB_NOTHR_COMMON_LIBS="" - GLITE_STATIC_LB_NOTHR_CLIENT_LIBS="" - GLITE_STATIC_LB_NOTHR_COMMON_LIBS="" - ifelse([$3], , :, [$3]) - fi - - AC_SUBST(GLITE_LB_THR_CLIENT_LIBS) - AC_SUBST(GLITE_LB_THR_CLIENTPP_LIBS) - AC_SUBST(GLITE_LB_THR_COMMON_LIBS) - AC_SUBST(GLITE_LB_NOTHR_CLIENT_LIBS) - AC_SUBST(GLITE_LB_NOTHR_CLIENTPP_LIBS) - AC_SUBST(GLITE_LB_NOTHR_COMMON_LIBS) - AC_SUBST(GLITE_STATIC_LB_NOTHR_CLIENT_LIBS) - AC_SUBST(GLITE_STATIC_LB_NOTHR_COMMON_LIBS) -]) - -AC_DEFUN([GLITE_CHECK_LB_CLIENT], -[AC_MSG_CHECKING([for org.glite.lb.client]) -save_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $GLITE_CPPFLAGS" -save_LDFLAGS=$LDFLAGS -LDFLAGS="$LDFLAGS $GLITE_LDFLAGS -L$GLOBUS_LOCATION/lib" -save_LIBS=$LIBS - -AC_LANG_PUSH([C]) - -# prepare the test program, to link against the different combinations -# of globus flavours - -AC_LANG_CONFTEST( - [AC_LANG_PROGRAM( - [@%:@include "glite/lb/consumer.h"], - [edg_wll_QueryEvents( - (edg_wll_Context)0, - (const edg_wll_QueryRec*)0, - (const edg_wll_QueryRec*)0, - (edg_wll_Event**)0 - );] - )] -) - -LIBS="-lglite_lb_client_$GLOBUS_THR_FLAVOR $LIBS" -AC_LINK_IFELSE([], - [AC_SUBST([GLITE_LB_CLIENT_THR_LIBS], [-lglite_lb_client_$GLOBUS_THR_FLAVOR])], - [AC_MSG_ERROR([cannot find org.glite.lb.client ($GLOBUS_THR_FLAVOR)])] -) -LIBS=$save_LIBS - -LIBS="-lglite_lb_client_$GLOBUS_NOTHR_FLAVOR $LIBS" -AC_LINK_IFELSE([], - [AC_SUBST([GLITE_LB_CLIENT_NOTHR_LIBS], [-lglite_lb_client_$GLOBUS_NOTHR_FLAVOR])], - [AC_MSG_ERROR([cannot find org.glite.lb.client ($GLOBUS_NOTHR_FLAVOR)])] -) -LIBS=$save_LIBS - -AC_LANG_POP([C]) - -AC_LANG_PUSH([C++]) - -# prepare the test program, to link against the different combinations -# of globus flavours - -AC_LANG_CONFTEST( - [AC_LANG_PROGRAM( - [@%:@include "glite/lb/Job.h"], - [glite::lb::Job job;] - )] -) - -save_LIBS=$LIBS -LIBS="-lglite_lb_clientpp_$GLOBUS_THR_FLAVOR $LIBS" -AC_LINK_IFELSE([], - [AC_SUBST([GLITE_LB_CLIENTPP_THR_LIBS], [-lglite_lb_clientpp_$GLOBUS_THR_FLAVOR])], - [AC_MSG_ERROR([cannot find org.glite.lb.client (C++ - $GLOBUS_THR_FLAVOR)])] -) -LIBS=$save_LIBS - -LIBS="-lglite_lb_clientpp_$GLOBUS_NOTHR_FLAVOR $LIBS" -AC_LINK_IFELSE([], - [AC_SUBST([GLITE_LB_CLIENTPP_NOTHR_LIBS], [-lglite_lb_clientpp_$GLOBUS_NOTHR_FLAVOR])], - [AC_MSG_ERROR([cannot find org.glite.lb.client (C++ - $GLOBUS_NOTHR_FLAVOR)])] -) -LIBS=$save_LIBS - -AC_LANG_POP([C++]) - -LDFLAGS="$save_LDFLAGS" -CPPFLAGS=$save_CPPFLAGS - -AC_MSG_RESULT([yes]) - -]) diff --git a/org.glite.lb.client/project/ChangeLog b/org.glite.lb.client/project/ChangeLog index 61cc514..4a993f8 100644 --- a/org.glite.lb.client/project/ChangeLog +++ b/org.glite.lb.client/project/ChangeLog @@ -61,6 +61,19 @@ 4.0.3-2 - install libraries into $libdir +4.0.4-1 +- Connection pool lock optimization and fixes +- Rare crash fixes in notify example + +4.0.5-1 +- Compatibility with IPv6 compliant clients + +4.0.6-1 +- Install glite_lb.m4 rather than glite_lb_client.m4 + +4.0.7-1 +- hard-coded 'lib' fixed in glite_lb.m4 + 4.1.0-1 - Support for CREAM jobs - Support for logging sandbox transfers as jobs of a specific type diff --git a/org.glite.lb.common/configure b/org.glite.lb.common/configure index 71ff6f0..c82ed75 100755 --- a/org.glite.lb.common/configure +++ b/org.glite.lb.common/configure @@ -330,7 +330,7 @@ BEGIN{ 'lb.harvester' => [ qw// ], 'lb.yaim' => [ qw/yaim_core:R/ ], 'lb.glite-LB' => [ qw/fetchcrl:R gpt:R gip_release:R gip_service:R bdii:R glite_version:R glite_info_templates:R glue_schema:R/ ], - 'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ], + 'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B cppunit:B log4c:B/ ], 'lbjp-common.log' => [ qw/log4c/ ], 'lbjp-common.maildir' => [ qw// ], 'lbjp-common.server-bones' => [ qw// ], @@ -416,7 +416,7 @@ for my $jar (keys %need_jars) { 'lb.yaim' => [ qw// ], 'lb.glite-LB' => [ qw/ lb.logger:R lb.server:R lb.utils:R lb.doc:R - lb.ws-test:R lb.harvester:R lb.yaim:R + lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R / ], 'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ], 'lbjp-common.maildir' => [ qw// ], diff --git a/org.glite.lb.common/project/ChangeLog b/org.glite.lb.common/project/ChangeLog index ad998dd..1160bb8 100644 --- a/org.glite.lb.common/project/ChangeLog +++ b/org.glite.lb.common/project/ChangeLog @@ -55,8 +55,16 @@ 7.0.4-2 - Buildtime dependency on c-ares +7.0.5-1 +- Comments for common event fields +- Locking in connPool initiation + +7.0.6-1 +- Remove glite_lb_common.m4 (replaced by glite_lb.m4 from lb.client) + 7.1.0-1 - Advanced Autorization 7.1.1-1 - Broader authorization policy format + diff --git a/org.glite.lb.doc/configure b/org.glite.lb.doc/configure index 8188919..c82ed75 100755 --- a/org.glite.lb.doc/configure +++ b/org.glite.lb.doc/configure @@ -416,7 +416,7 @@ for my $jar (keys %need_jars) { 'lb.yaim' => [ qw// ], 'lb.glite-LB' => [ qw/ lb.logger:R lb.server:R lb.utils:R lb.doc:R - lb.ws-test:R lb.harvester:R lb.yaim:R + lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R / ], 'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ], 'lbjp-common.maildir' => [ qw// ], diff --git a/org.glite.lb.doc/project/ChangeLog b/org.glite.lb.doc/project/ChangeLog index 19e4204..8f03583 100644 --- a/org.glite.lb.doc/project/ChangeLog +++ b/org.glite.lb.doc/project/ChangeLog @@ -18,6 +18,10 @@ 1.0.3-1 - Updates to the User Guide, Admin Guide and Test Plan Test Suite Documentation +1.0.4-1 +- Admin Guide updates - installation and migration +- Test Plan updates + 1.1.0-1 - Documentation updated to follow development diff --git a/org.glite.lb.logger/configure b/org.glite.lb.logger/configure index 71ff6f0..c82ed75 100755 --- a/org.glite.lb.logger/configure +++ b/org.glite.lb.logger/configure @@ -330,7 +330,7 @@ BEGIN{ 'lb.harvester' => [ qw// ], 'lb.yaim' => [ qw/yaim_core:R/ ], 'lb.glite-LB' => [ qw/fetchcrl:R gpt:R gip_release:R gip_service:R bdii:R glite_version:R glite_info_templates:R glue_schema:R/ ], - 'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ], + 'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B cppunit:B log4c:B/ ], 'lbjp-common.log' => [ qw/log4c/ ], 'lbjp-common.maildir' => [ qw// ], 'lbjp-common.server-bones' => [ qw// ], @@ -416,7 +416,7 @@ for my $jar (keys %need_jars) { 'lb.yaim' => [ qw// ], 'lb.glite-LB' => [ qw/ lb.logger:R lb.server:R lb.utils:R lb.doc:R - lb.ws-test:R lb.harvester:R lb.yaim:R + lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R / ], 'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ], 'lbjp-common.maildir' => [ qw// ], diff --git a/org.glite.lb.logger/project/ChangeLog b/org.glite.lb.logger/project/ChangeLog index a4bee80..4cd97d7 100644 --- a/org.glite.lb.logger/project/ChangeLog +++ b/org.glite.lb.logger/project/ChangeLog @@ -52,6 +52,15 @@ 2.0.4-2 - install libraries into $libdir +2.0.6-1 +- Pidfiles support in daemons + +2.0.7-1 +- Startup script fixes + +2.0.8-1 +- Compatibility with IPv6 compliant clients + 2.1.0-1 - Compliance with the Common Logging Format - Fixed startup script (Savannah Bug #29081) diff --git a/org.glite.lb.logger/src/event_queue.c b/org.glite.lb.logger/src/event_queue.c index 84e32df..cbf0bee 100644 --- a/org.glite.lb.logger/src/event_queue.c +++ b/org.glite.lb.logger/src/event_queue.c @@ -44,6 +44,11 @@ event_queue_create(char *server_name, struct il_output_plugin *output) struct event_queue *eq; char *p,*s, c; + p = strrchr(server_name, ':'); + + if(p) + *p++ = 0; + if((eq = malloc(sizeof(*eq))) == NULL) { set_error(IL_NOMEM, ENOMEM, "event_queue_create: error allocating event queue"); return(NULL); diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup index 0b1fdce..d0a6ce9 100755 --- a/org.glite.lb.server/config/startup +++ b/org.glite.lb.server/config/startup @@ -239,9 +239,7 @@ stop() stop_daemon "glite-lb-notif-interlogd" $NOTIF_IL_PIDFILE stop_daemon "glite-lb-bkserverd" $BK_PIDFILE - if test x"$GLITE_LB_EXPORT_ENABLED" = x"true"; then - stop_daemon "glite-jp-importer" $jp_importer_pidfile - fi + stop_daemon "glite-jp-importer" $jp_importer_pidfile stop_daemon "glite-lb-interlogd" $PROXY_IL_PIDFILE diff --git a/org.glite.lb.server/configure b/org.glite.lb.server/configure index 8188919..c82ed75 100755 --- a/org.glite.lb.server/configure +++ b/org.glite.lb.server/configure @@ -416,7 +416,7 @@ for my $jar (keys %need_jars) { 'lb.yaim' => [ qw// ], 'lb.glite-LB' => [ qw/ lb.logger:R lb.server:R lb.utils:R lb.doc:R - lb.ws-test:R lb.harvester:R lb.yaim:R + lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R / ], 'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ], 'lbjp-common.maildir' => [ qw// ], diff --git a/org.glite.lb.server/project/ChangeLog b/org.glite.lb.server/project/ChangeLog index df8a639..e1889b6 100644 --- a/org.glite.lb.server/project/ChangeLog +++ b/org.glite.lb.server/project/ChangeLog @@ -93,19 +93,34 @@ 2.0.3-2 - Rebuild with lb.state-machine 1.0.2-1 ---- -Crystal ball: +2.0.3-3 +- install libraries into $libdir +- buildtime dependency pn c-ares + 2.0.4-1 - Consider arch libdir when linking c-ares - Checking the c-ares version, fix for c-ares >= 1.5.0. 2.0.5-1 - Reflect updates in the database module -- Adjusted grey job purges (purge undefined jobs etc.) +- Adjusted grey job purges +- Purge undefined or unknown jobs -2.0.3-3 -- install libraries into $libdir -- buildtime dependency on c-ares +2.0.6-1 +- Fixed collection state with cancelled subjobs + +2.0.7-1 +- Starting proxy support +- Fixed collection state with cancelled subjobs + +2.0.7-2 +- Rebuild with gridsite 1.5.10.5-3 + +2.0.8-1 +- Startup script fixes + +2.0.9-1 +- Compatibility with IPv6 compliant clients 2.1.0-1 - Advanced Autorization (used by LCAS plugin too, old configuration file not supported anymore) diff --git a/org.glite.lb.server/src/jobstat.c b/org.glite.lb.server/src/jobstat.c index ef067c8..fa75a56 100644 --- a/org.glite.lb.server/src/jobstat.c +++ b/org.glite.lb.server/src/jobstat.c @@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ - +#ident "$Header$" #include #include diff --git a/org.glite.lb.types/configure b/org.glite.lb.types/configure index 8f92219..c82ed75 100755 --- a/org.glite.lb.types/configure +++ b/org.glite.lb.types/configure @@ -327,10 +327,10 @@ BEGIN{ 'lb.ws-interface' => [], 'lb.ws-test' => [ qw/gsoap:B/ ], 'lb.types' => [ qw// ], - 'lb.harvester' => [ qw/postgresql:R/ ], - 'lb.yaim' => [ qw/glite-yaim-core:R/ ], + 'lb.harvester' => [ qw// ], + 'lb.yaim' => [ qw/yaim_core:R/ ], 'lb.glite-LB' => [ qw/fetchcrl:R gpt:R gip_release:R gip_service:R bdii:R glite_version:R glite_info_templates:R glue_schema:R/ ], - 'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ], + 'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B cppunit:B log4c:B/ ], 'lbjp-common.log' => [ qw/log4c/ ], 'lbjp-common.maildir' => [ qw// ], 'lbjp-common.server-bones' => [ qw// ], @@ -416,7 +416,7 @@ for my $jar (keys %need_jars) { 'lb.yaim' => [ qw// ], 'lb.glite-LB' => [ qw/ lb.logger:R lb.server:R lb.utils:R lb.doc:R - lb.ws-test:R lb.harvester:R lb.yaim:R + lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R / ], 'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ], 'lbjp-common.maildir' => [ qw// ], @@ -475,6 +475,10 @@ for my $ext (keys %deps_aux) { jpclient => 'jp.client', ); +%obsoletes = ( + 'lb.yaim' => [ qq/glite-yaim-lb/ ], +); + my @t = qw/lb.client-java jobid.api-java lb.types/; @topbuild{@t} = (1) x ($#t+1); } @@ -490,7 +494,7 @@ sub mkinc my %aux; undef %aux; my @m=qw/ -lb.client lb.doc lb.state-machine lb.ws-interface lb.logger lb.types lb.common lb.server lb.utils lb.ws-test lb.client-java lb.harvester lb.yaim +lb.client lb.doc lb.state-machine lb.ws-interface lb.logger lb.types lb.common lb.server lb.utils lb.ws-test lb.client-java lb.harvester lb.yaim lb.glite-LB security.gss security.gsoap-plugin jobid.api-c jobid.api-cpp jobid.api-java lbjp-common.db lbjp-common.log lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface @@ -566,10 +570,11 @@ BEGIN{ glite_version=>'glite-version', glite_info_templates=>'glite-info-templates', glue_schema=>'glue-schema', + yaim_core=>'org.glite.yaim.core', ); %etics_projects = ( vdt=>[qw/globus globus_essentials/], - 'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema/], + 'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/], ); }; @@ -694,16 +699,21 @@ init = None install = make install clean = make clean test = make check -configure = cd $confdir && \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts +configure = cd $confdir && /usr/bin/perl \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts checkstyle = None [Platform-default:Property] $buildroot $package_description $package_summary +}; + for (@{$obsoletes{"$subsys.$module"}}) { + print C "package.obsoletes = $_\n"; + print C "package.replaces = $_\n"; + } + print C qq{ [Platform-default:DynamicDependency] - }; for (@{$need_externs{"$subsys.$module"}},@{$need_jars{"$subsys.$module"}}) { my $eext = $etics_externs{$_} ? $etics_externs{$_} : $_; diff --git a/org.glite.lb.types/project/ChangeLog b/org.glite.lb.types/project/ChangeLog index dde4b63..690da5f 100644 --- a/org.glite.lb.types/project/ChangeLog +++ b/org.glite.lb.types/project/ChangeLog @@ -18,3 +18,5 @@ - Support for CREAM jobs - Type comments made complete +1.0.2-1 +- Fix build with binary version of this module diff --git a/org.glite.lb.types/project/version.properties b/org.glite.lb.types/project/version.properties index 1ef4b00..556297d 100644 --- a/org.glite.lb.types/project/version.properties +++ b/org.glite.lb.types/project/version.properties @@ -1,2 +1,3 @@ +# $Header$ module.version=1.1.0 module.age=1 diff --git a/org.glite.lb.ws-test/configure b/org.glite.lb.ws-test/configure index 8188919..c82ed75 100755 --- a/org.glite.lb.ws-test/configure +++ b/org.glite.lb.ws-test/configure @@ -416,7 +416,7 @@ for my $jar (keys %need_jars) { 'lb.yaim' => [ qw// ], 'lb.glite-LB' => [ qw/ lb.logger:R lb.server:R lb.utils:R lb.doc:R - lb.ws-test:R lb.harvester:R lb.yaim:R + lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R / ], 'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ], 'lbjp-common.maildir' => [ qw// ], diff --git a/org.glite.lb.ws-test/project/ChangeLog b/org.glite.lb.ws-test/project/ChangeLog index 06ae020..b9e0a6f 100644 --- a/org.glite.lb.ws-test/project/ChangeLog +++ b/org.glite.lb.ws-test/project/ChangeLog @@ -20,10 +20,12 @@ 1.0.1-3 - Module repacked +1.0.2-1 +- Flavor libdir in Makefile + 1.1.0-1 - Primitive AGU compatibility 1.1.1-1 - LB 4 AGU fixes - Updated WS error handling - -- 1.8.2.3