From d1cd02c006252720b82446e2e8dd0da802a74ac2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 5 Aug 2010 18:19:11 +0000 Subject: [PATCH] Using jakarta-commons-* external modules. --- org.glite.jobid.api-java/Makefile | 2 +- org.glite.jobid.api-java/configure | 10 +++++----- org.glite.lb.client-java/Makefile | 2 +- org.glite.lb.client-java/configure | 10 +++++----- org.glite.lb/configure | 10 +++++----- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/org.glite.jobid.api-java/Makefile b/org.glite.jobid.api-java/Makefile index 37730c0..b920e6c 100644 --- a/org.glite.jobid.api-java/Makefile +++ b/org.glite.jobid.api-java/Makefile @@ -1,7 +1,7 @@ -include Makefile.inc all compile: - ${ant_prefix}/bin/ant -Dfile.reference.commons-codec.jar=${commons-codec_jar} + ${ant_prefix}/bin/ant -Dfile.reference.commons-codec.jar=${jakarta-commons-codec_jar} install: mkdir -p ${PREFIX}/share/java diff --git a/org.glite.jobid.api-java/configure b/org.glite.jobid.api-java/configure index d02462c..0022b05 100755 --- a/org.glite.jobid.api-java/configure +++ b/org.glite.jobid.api-java/configure @@ -73,8 +73,8 @@ my %extern_prefix = ( ); my %jar = ( - 'commons-codec' => '/usr/share/java/commons-codec.jar', - 'commons-lang' => '/usr/share/java/commons-lang.jar', + 'jakarta-commons-codec' => '/usr/share/java/commons-codec.jar', + 'jakarta-commons-lang' => '/usr/share/java/commons-lang.jar', ); @@ -360,8 +360,8 @@ for my $ext (keys %need_externs_aux) { } %need_jars = ( - 'jobid.api-java' => [ qw/commons-codec/ ], - 'lb.client-java' => [ qw/commons-lang/ ], + 'jobid.api-java' => [ qw/jakarta-commons-codec/ ], + 'lb.client-java' => [ qw/jakarta-commons-lang/ ], ); for my $jar (keys %need_jars) { @@ -657,7 +657,7 @@ sub mode_etics { for (@{$need_jars{"$subsys.$module"}}) { my $eext = $etics_externs{$_} ? $etics_externs{$_} : $_; - push @copts,"--with-$_ \${$eext.location}/$_*.jar"; + push @copts,"--with-$_ \${$eext.location}/usr/share/java/$_*.jar"; } my $conf; diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile index a382e0e..5a8c2b4 100644 --- a/org.glite.lb.client-java/Makefile +++ b/org.glite.lb.client-java/Makefile @@ -15,7 +15,7 @@ all compile: genevents genws compile-java build-jar build-c compile-java: ${JAVAC} \ - -classpath ${commons-lang_jar}:${stagedir}/share/java/jobid-api-java.jar:${trustmanager_prefix}/share/java/glite-security-trustmanager.jar:${utiljava_prefix}/share/java/glite-security-util-java.jar:`ls ${axis_prefix}/lib/*.jar | tr '\012' :` \ + -classpath ${jakarta-commons-lang_jar}:${stagedir}/share/java/jobid-api-java.jar:${trustmanager_prefix}/share/java/glite-security-trustmanager.jar:${utiljava_prefix}/share/java/glite-security-util-java.jar:`ls ${axis_prefix}/lib/*.jar | tr '\012' :` \ -d build \ src/org/glite/lb/*.java \ build/gen/*.java \ diff --git a/org.glite.lb.client-java/configure b/org.glite.lb.client-java/configure index d02462c..0022b05 100755 --- a/org.glite.lb.client-java/configure +++ b/org.glite.lb.client-java/configure @@ -73,8 +73,8 @@ my %extern_prefix = ( ); my %jar = ( - 'commons-codec' => '/usr/share/java/commons-codec.jar', - 'commons-lang' => '/usr/share/java/commons-lang.jar', + 'jakarta-commons-codec' => '/usr/share/java/commons-codec.jar', + 'jakarta-commons-lang' => '/usr/share/java/commons-lang.jar', ); @@ -360,8 +360,8 @@ for my $ext (keys %need_externs_aux) { } %need_jars = ( - 'jobid.api-java' => [ qw/commons-codec/ ], - 'lb.client-java' => [ qw/commons-lang/ ], + 'jobid.api-java' => [ qw/jakarta-commons-codec/ ], + 'lb.client-java' => [ qw/jakarta-commons-lang/ ], ); for my $jar (keys %need_jars) { @@ -657,7 +657,7 @@ sub mode_etics { for (@{$need_jars{"$subsys.$module"}}) { my $eext = $etics_externs{$_} ? $etics_externs{$_} : $_; - push @copts,"--with-$_ \${$eext.location}/$_*.jar"; + push @copts,"--with-$_ \${$eext.location}/usr/share/java/$_*.jar"; } my $conf; diff --git a/org.glite.lb/configure b/org.glite.lb/configure index d02462c..0022b05 100755 --- a/org.glite.lb/configure +++ b/org.glite.lb/configure @@ -73,8 +73,8 @@ my %extern_prefix = ( ); my %jar = ( - 'commons-codec' => '/usr/share/java/commons-codec.jar', - 'commons-lang' => '/usr/share/java/commons-lang.jar', + 'jakarta-commons-codec' => '/usr/share/java/commons-codec.jar', + 'jakarta-commons-lang' => '/usr/share/java/commons-lang.jar', ); @@ -360,8 +360,8 @@ for my $ext (keys %need_externs_aux) { } %need_jars = ( - 'jobid.api-java' => [ qw/commons-codec/ ], - 'lb.client-java' => [ qw/commons-lang/ ], + 'jobid.api-java' => [ qw/jakarta-commons-codec/ ], + 'lb.client-java' => [ qw/jakarta-commons-lang/ ], ); for my $jar (keys %need_jars) { @@ -657,7 +657,7 @@ sub mode_etics { for (@{$need_jars{"$subsys.$module"}}) { my $eext = $etics_externs{$_} ? $etics_externs{$_} : $_; - push @copts,"--with-$_ \${$eext.location}/$_*.jar"; + push @copts,"--with-$_ \${$eext.location}/usr/share/java/$_*.jar"; } my $conf; -- 1.8.2.3