From 001fc6709c8a1c87ed45ec30a2211542b056b7e3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= <sustr4@cesnet.cz>
Date: Fri, 24 Sep 2010 10:56:10 +0000
Subject: [PATCH] The most recent version copied. Do not modify this instance
 (RW in ./org.glite.lb).

---
 org.glite.lb.client-java/configure   | 48 +++++++++++++++++++++++++------
 org.glite.lb.glite-LB/configure      | 56 ++++++++++++++++++++++++++++--------
 org.glite.lb.logger/configure        | 56 ++++++++++++++++++++++++++++--------
 org.glite.lb.server/configure        | 56 ++++++++++++++++++++++++++++--------
 org.glite.lb.state-machine/configure | 56 ++++++++++++++++++++++++++++--------
 org.glite.lb.utils/configure         | 56 ++++++++++++++++++++++++++++--------
 org.glite.lb.ws-test/configure       | 56 ++++++++++++++++++++++++++++--------
 org.glite.lb.yaim/configure          | 56 ++++++++++++++++++++++++++++--------
 8 files changed, 348 insertions(+), 92 deletions(-)

diff --git a/org.glite.lb.client-java/configure b/org.glite.lb.client-java/configure
index 0022b05..7706bf1 100755
--- a/org.glite.lb.client-java/configure
+++ b/org.glite.lb.client-java/configure
@@ -117,6 +117,7 @@ my @opts = (
 	'jobid-tag=s' => \$jobid_tag,
 	'help' => \$help,
 	'libdir=s' => \$libdir,
+	'emi' => \$emi,
 );
 
 for (@nodes) {
@@ -501,6 +502,15 @@ for my $ext (keys %deps_aux) {
 	'security' => 'glite-',
 );
 
+%emi_conf_prefix = (
+	'lb' => 'emi-',
+	'jp' => 'emi-',
+	'jobid' => 'emi-',
+	'lbjp-common' => 'emi-',
+	'gridsite' => '',
+	'security' => 'emi-',
+);
+
 my @k = keys %deps_aux;
 @buildroot{@k} = ('build') x ($#k+1);
 
@@ -657,22 +667,33 @@ sub mode_etics {
 	for (@{$need_jars{"$subsys.$module"}}) {
 		my $eext = $etics_externs{$_} ? $etics_externs{$_} : $_;
 
-		push @copts,"--with-$_ \${$eext.location}/usr/share/java/$_*.jar";
+		push @copts,"--with-$_ \${$eext.location}$jar{$_}.jar";
 	}
 
 	my $conf;
 	my $conftag;
+	my $confprefix;
 
 	$dwpath = "path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz\n";
+
+	if ($emi) { $confprefix = $emi_conf_prefix{$subsys} }
+	else { $confprefix = $conf_prefix{$subsys} }
+
 	if ($branch) {
-		$conf = "$conf_prefix{$subsys}${subsys}-${module}_$branch"; 
+		$conf = "$confprefix${subsys}-${module}_$branch"; 
 		$conftag = $branch;
-		$age = '0dev'; }
+		# forced low age number
+		$age = $branch eq 'HEAD' ? '0head' : '0dev'; }
 	else {
-		$conf = "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+		$conf = "$confprefix$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
 
 # XXX: gridsite hack
-		$conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : $conf; }
+		$conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : 
+			"$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; }
+	if ($emi) {
+		$age = "${age}emi";
+	} 
+
 	my $file = $output ? $output : "$conf.ini";
 	open C,">$file" or die "$file: $!\n";
 
@@ -734,6 +755,13 @@ sub mode_etics {
 		$defprops .= $p . ' = ' . $platform_properties{"$subsys.$module"}->{default}->{$p} . "\n";
 	}
 
+	my $checkoutcmd;
+	if ($conftag eq 'HEAD') {
+		$checkoutcmd = "cvs -d \${vcsroot} co -A \${moduleName}";
+	} else {
+		$checkoutcmd = "cvs -d \${vcsroot} co -r \${tag} \${moduleName}";
+	}
+
 	print STDERR "Writing $file\n";
 	print C qq{
 [Configuration-$conf]
@@ -753,7 +781,7 @@ description = None
 tag = cvs -d \${vcsroot} tag -R \${tag} \${moduleName}
 branch = None
 commit = None
-checkout = cvs -d \${vcsroot} co -r \${tag} \${moduleName}
+checkout = $checkoutcmd
 
 [Platform-default:BuildCommand]
 postpublish = None
@@ -776,8 +804,9 @@ $buildroot
 aprSuffix = 0
 package.RPMSLocation = \${moduleDir}/RPMTMP/RPMS
 package.SRPMSLocation = \${moduleDir}/RPMTMP/SRPMS
-$package_description$package_summary$defprops
-};
+package.preserve.libtool = false
+$package_description$package_summary$defprops};
+
 	for (@{$obsoletes{"$subsys.$module"}}) {
 		print C "package.obsoletes = $_\n";
 		print C "package.replaces = $_\n";
@@ -898,7 +927,10 @@ General options (defaults in []):
   --thrflavour=flavour
   --nothrflavour=flavour	threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg]
   --listmodules=subsys          list modules of a subsystem
+  --version=maj.min.rev-age	specify version here instead of reading version.properties
+  --branch=branch		CVS branch/etics name suffix (HEAD, branch_2_1, ...)
   --libdir=libdir		typically [lib,lib64] postfix
+  --emi				generate configurations with emi flavor in mode 'etics'
   
 Mode of operation:
   --mode={checkout|build|etics}	what to do [build]
diff --git a/org.glite.lb.glite-LB/configure b/org.glite.lb.glite-LB/configure
index d02462c..7706bf1 100755
--- a/org.glite.lb.glite-LB/configure
+++ b/org.glite.lb.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',
 );
 
 
@@ -117,6 +117,7 @@ my @opts = (
 	'jobid-tag=s' => \$jobid_tag,
 	'help' => \$help,
 	'libdir=s' => \$libdir,
+	'emi' => \$emi,
 );
 
 for (@nodes) {
@@ -360,8 +361,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) {
@@ -501,6 +502,15 @@ for my $ext (keys %deps_aux) {
 	'security' => 'glite-',
 );
 
+%emi_conf_prefix = (
+	'lb' => 'emi-',
+	'jp' => 'emi-',
+	'jobid' => 'emi-',
+	'lbjp-common' => 'emi-',
+	'gridsite' => '',
+	'security' => 'emi-',
+);
+
 my @k = keys %deps_aux;
 @buildroot{@k} = ('build') x ($#k+1);
 
@@ -657,22 +667,33 @@ 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}$jar{$_}.jar";
 	}
 
 	my $conf;
 	my $conftag;
+	my $confprefix;
 
 	$dwpath = "path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz\n";
+
+	if ($emi) { $confprefix = $emi_conf_prefix{$subsys} }
+	else { $confprefix = $conf_prefix{$subsys} }
+
 	if ($branch) {
-		$conf = "$conf_prefix{$subsys}${subsys}-${module}_$branch"; 
+		$conf = "$confprefix${subsys}-${module}_$branch"; 
 		$conftag = $branch;
-		$age = '0dev'; }
+		# forced low age number
+		$age = $branch eq 'HEAD' ? '0head' : '0dev'; }
 	else {
-		$conf = "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+		$conf = "$confprefix$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
 
 # XXX: gridsite hack
-		$conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : $conf; }
+		$conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : 
+			"$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; }
+	if ($emi) {
+		$age = "${age}emi";
+	} 
+
 	my $file = $output ? $output : "$conf.ini";
 	open C,">$file" or die "$file: $!\n";
 
@@ -734,6 +755,13 @@ sub mode_etics {
 		$defprops .= $p . ' = ' . $platform_properties{"$subsys.$module"}->{default}->{$p} . "\n";
 	}
 
+	my $checkoutcmd;
+	if ($conftag eq 'HEAD') {
+		$checkoutcmd = "cvs -d \${vcsroot} co -A \${moduleName}";
+	} else {
+		$checkoutcmd = "cvs -d \${vcsroot} co -r \${tag} \${moduleName}";
+	}
+
 	print STDERR "Writing $file\n";
 	print C qq{
 [Configuration-$conf]
@@ -753,7 +781,7 @@ description = None
 tag = cvs -d \${vcsroot} tag -R \${tag} \${moduleName}
 branch = None
 commit = None
-checkout = cvs -d \${vcsroot} co -r \${tag} \${moduleName}
+checkout = $checkoutcmd
 
 [Platform-default:BuildCommand]
 postpublish = None
@@ -776,8 +804,9 @@ $buildroot
 aprSuffix = 0
 package.RPMSLocation = \${moduleDir}/RPMTMP/RPMS
 package.SRPMSLocation = \${moduleDir}/RPMTMP/SRPMS
-$package_description$package_summary$defprops
-};
+package.preserve.libtool = false
+$package_description$package_summary$defprops};
+
 	for (@{$obsoletes{"$subsys.$module"}}) {
 		print C "package.obsoletes = $_\n";
 		print C "package.replaces = $_\n";
@@ -898,7 +927,10 @@ General options (defaults in []):
   --thrflavour=flavour
   --nothrflavour=flavour	threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg]
   --listmodules=subsys          list modules of a subsystem
+  --version=maj.min.rev-age	specify version here instead of reading version.properties
+  --branch=branch		CVS branch/etics name suffix (HEAD, branch_2_1, ...)
   --libdir=libdir		typically [lib,lib64] postfix
+  --emi				generate configurations with emi flavor in mode 'etics'
   
 Mode of operation:
   --mode={checkout|build|etics}	what to do [build]
diff --git a/org.glite.lb.logger/configure b/org.glite.lb.logger/configure
index d02462c..7706bf1 100755
--- a/org.glite.lb.logger/configure
+++ b/org.glite.lb.logger/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',
 );
 
 
@@ -117,6 +117,7 @@ my @opts = (
 	'jobid-tag=s' => \$jobid_tag,
 	'help' => \$help,
 	'libdir=s' => \$libdir,
+	'emi' => \$emi,
 );
 
 for (@nodes) {
@@ -360,8 +361,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) {
@@ -501,6 +502,15 @@ for my $ext (keys %deps_aux) {
 	'security' => 'glite-',
 );
 
+%emi_conf_prefix = (
+	'lb' => 'emi-',
+	'jp' => 'emi-',
+	'jobid' => 'emi-',
+	'lbjp-common' => 'emi-',
+	'gridsite' => '',
+	'security' => 'emi-',
+);
+
 my @k = keys %deps_aux;
 @buildroot{@k} = ('build') x ($#k+1);
 
@@ -657,22 +667,33 @@ 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}$jar{$_}.jar";
 	}
 
 	my $conf;
 	my $conftag;
+	my $confprefix;
 
 	$dwpath = "path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz\n";
+
+	if ($emi) { $confprefix = $emi_conf_prefix{$subsys} }
+	else { $confprefix = $conf_prefix{$subsys} }
+
 	if ($branch) {
-		$conf = "$conf_prefix{$subsys}${subsys}-${module}_$branch"; 
+		$conf = "$confprefix${subsys}-${module}_$branch"; 
 		$conftag = $branch;
-		$age = '0dev'; }
+		# forced low age number
+		$age = $branch eq 'HEAD' ? '0head' : '0dev'; }
 	else {
-		$conf = "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+		$conf = "$confprefix$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
 
 # XXX: gridsite hack
-		$conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : $conf; }
+		$conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : 
+			"$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; }
+	if ($emi) {
+		$age = "${age}emi";
+	} 
+
 	my $file = $output ? $output : "$conf.ini";
 	open C,">$file" or die "$file: $!\n";
 
@@ -734,6 +755,13 @@ sub mode_etics {
 		$defprops .= $p . ' = ' . $platform_properties{"$subsys.$module"}->{default}->{$p} . "\n";
 	}
 
+	my $checkoutcmd;
+	if ($conftag eq 'HEAD') {
+		$checkoutcmd = "cvs -d \${vcsroot} co -A \${moduleName}";
+	} else {
+		$checkoutcmd = "cvs -d \${vcsroot} co -r \${tag} \${moduleName}";
+	}
+
 	print STDERR "Writing $file\n";
 	print C qq{
 [Configuration-$conf]
@@ -753,7 +781,7 @@ description = None
 tag = cvs -d \${vcsroot} tag -R \${tag} \${moduleName}
 branch = None
 commit = None
-checkout = cvs -d \${vcsroot} co -r \${tag} \${moduleName}
+checkout = $checkoutcmd
 
 [Platform-default:BuildCommand]
 postpublish = None
@@ -776,8 +804,9 @@ $buildroot
 aprSuffix = 0
 package.RPMSLocation = \${moduleDir}/RPMTMP/RPMS
 package.SRPMSLocation = \${moduleDir}/RPMTMP/SRPMS
-$package_description$package_summary$defprops
-};
+package.preserve.libtool = false
+$package_description$package_summary$defprops};
+
 	for (@{$obsoletes{"$subsys.$module"}}) {
 		print C "package.obsoletes = $_\n";
 		print C "package.replaces = $_\n";
@@ -898,7 +927,10 @@ General options (defaults in []):
   --thrflavour=flavour
   --nothrflavour=flavour	threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg]
   --listmodules=subsys          list modules of a subsystem
+  --version=maj.min.rev-age	specify version here instead of reading version.properties
+  --branch=branch		CVS branch/etics name suffix (HEAD, branch_2_1, ...)
   --libdir=libdir		typically [lib,lib64] postfix
+  --emi				generate configurations with emi flavor in mode 'etics'
   
 Mode of operation:
   --mode={checkout|build|etics}	what to do [build]
diff --git a/org.glite.lb.server/configure b/org.glite.lb.server/configure
index d02462c..7706bf1 100755
--- a/org.glite.lb.server/configure
+++ b/org.glite.lb.server/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',
 );
 
 
@@ -117,6 +117,7 @@ my @opts = (
 	'jobid-tag=s' => \$jobid_tag,
 	'help' => \$help,
 	'libdir=s' => \$libdir,
+	'emi' => \$emi,
 );
 
 for (@nodes) {
@@ -360,8 +361,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) {
@@ -501,6 +502,15 @@ for my $ext (keys %deps_aux) {
 	'security' => 'glite-',
 );
 
+%emi_conf_prefix = (
+	'lb' => 'emi-',
+	'jp' => 'emi-',
+	'jobid' => 'emi-',
+	'lbjp-common' => 'emi-',
+	'gridsite' => '',
+	'security' => 'emi-',
+);
+
 my @k = keys %deps_aux;
 @buildroot{@k} = ('build') x ($#k+1);
 
@@ -657,22 +667,33 @@ 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}$jar{$_}.jar";
 	}
 
 	my $conf;
 	my $conftag;
+	my $confprefix;
 
 	$dwpath = "path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz\n";
+
+	if ($emi) { $confprefix = $emi_conf_prefix{$subsys} }
+	else { $confprefix = $conf_prefix{$subsys} }
+
 	if ($branch) {
-		$conf = "$conf_prefix{$subsys}${subsys}-${module}_$branch"; 
+		$conf = "$confprefix${subsys}-${module}_$branch"; 
 		$conftag = $branch;
-		$age = '0dev'; }
+		# forced low age number
+		$age = $branch eq 'HEAD' ? '0head' : '0dev'; }
 	else {
-		$conf = "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+		$conf = "$confprefix$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
 
 # XXX: gridsite hack
-		$conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : $conf; }
+		$conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : 
+			"$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; }
+	if ($emi) {
+		$age = "${age}emi";
+	} 
+
 	my $file = $output ? $output : "$conf.ini";
 	open C,">$file" or die "$file: $!\n";
 
@@ -734,6 +755,13 @@ sub mode_etics {
 		$defprops .= $p . ' = ' . $platform_properties{"$subsys.$module"}->{default}->{$p} . "\n";
 	}
 
+	my $checkoutcmd;
+	if ($conftag eq 'HEAD') {
+		$checkoutcmd = "cvs -d \${vcsroot} co -A \${moduleName}";
+	} else {
+		$checkoutcmd = "cvs -d \${vcsroot} co -r \${tag} \${moduleName}";
+	}
+
 	print STDERR "Writing $file\n";
 	print C qq{
 [Configuration-$conf]
@@ -753,7 +781,7 @@ description = None
 tag = cvs -d \${vcsroot} tag -R \${tag} \${moduleName}
 branch = None
 commit = None
-checkout = cvs -d \${vcsroot} co -r \${tag} \${moduleName}
+checkout = $checkoutcmd
 
 [Platform-default:BuildCommand]
 postpublish = None
@@ -776,8 +804,9 @@ $buildroot
 aprSuffix = 0
 package.RPMSLocation = \${moduleDir}/RPMTMP/RPMS
 package.SRPMSLocation = \${moduleDir}/RPMTMP/SRPMS
-$package_description$package_summary$defprops
-};
+package.preserve.libtool = false
+$package_description$package_summary$defprops};
+
 	for (@{$obsoletes{"$subsys.$module"}}) {
 		print C "package.obsoletes = $_\n";
 		print C "package.replaces = $_\n";
@@ -898,7 +927,10 @@ General options (defaults in []):
   --thrflavour=flavour
   --nothrflavour=flavour	threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg]
   --listmodules=subsys          list modules of a subsystem
+  --version=maj.min.rev-age	specify version here instead of reading version.properties
+  --branch=branch		CVS branch/etics name suffix (HEAD, branch_2_1, ...)
   --libdir=libdir		typically [lib,lib64] postfix
+  --emi				generate configurations with emi flavor in mode 'etics'
   
 Mode of operation:
   --mode={checkout|build|etics}	what to do [build]
diff --git a/org.glite.lb.state-machine/configure b/org.glite.lb.state-machine/configure
index d02462c..7706bf1 100755
--- a/org.glite.lb.state-machine/configure
+++ b/org.glite.lb.state-machine/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',
 );
 
 
@@ -117,6 +117,7 @@ my @opts = (
 	'jobid-tag=s' => \$jobid_tag,
 	'help' => \$help,
 	'libdir=s' => \$libdir,
+	'emi' => \$emi,
 );
 
 for (@nodes) {
@@ -360,8 +361,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) {
@@ -501,6 +502,15 @@ for my $ext (keys %deps_aux) {
 	'security' => 'glite-',
 );
 
+%emi_conf_prefix = (
+	'lb' => 'emi-',
+	'jp' => 'emi-',
+	'jobid' => 'emi-',
+	'lbjp-common' => 'emi-',
+	'gridsite' => '',
+	'security' => 'emi-',
+);
+
 my @k = keys %deps_aux;
 @buildroot{@k} = ('build') x ($#k+1);
 
@@ -657,22 +667,33 @@ 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}$jar{$_}.jar";
 	}
 
 	my $conf;
 	my $conftag;
+	my $confprefix;
 
 	$dwpath = "path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz\n";
+
+	if ($emi) { $confprefix = $emi_conf_prefix{$subsys} }
+	else { $confprefix = $conf_prefix{$subsys} }
+
 	if ($branch) {
-		$conf = "$conf_prefix{$subsys}${subsys}-${module}_$branch"; 
+		$conf = "$confprefix${subsys}-${module}_$branch"; 
 		$conftag = $branch;
-		$age = '0dev'; }
+		# forced low age number
+		$age = $branch eq 'HEAD' ? '0head' : '0dev'; }
 	else {
-		$conf = "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+		$conf = "$confprefix$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
 
 # XXX: gridsite hack
-		$conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : $conf; }
+		$conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : 
+			"$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; }
+	if ($emi) {
+		$age = "${age}emi";
+	} 
+
 	my $file = $output ? $output : "$conf.ini";
 	open C,">$file" or die "$file: $!\n";
 
@@ -734,6 +755,13 @@ sub mode_etics {
 		$defprops .= $p . ' = ' . $platform_properties{"$subsys.$module"}->{default}->{$p} . "\n";
 	}
 
+	my $checkoutcmd;
+	if ($conftag eq 'HEAD') {
+		$checkoutcmd = "cvs -d \${vcsroot} co -A \${moduleName}";
+	} else {
+		$checkoutcmd = "cvs -d \${vcsroot} co -r \${tag} \${moduleName}";
+	}
+
 	print STDERR "Writing $file\n";
 	print C qq{
 [Configuration-$conf]
@@ -753,7 +781,7 @@ description = None
 tag = cvs -d \${vcsroot} tag -R \${tag} \${moduleName}
 branch = None
 commit = None
-checkout = cvs -d \${vcsroot} co -r \${tag} \${moduleName}
+checkout = $checkoutcmd
 
 [Platform-default:BuildCommand]
 postpublish = None
@@ -776,8 +804,9 @@ $buildroot
 aprSuffix = 0
 package.RPMSLocation = \${moduleDir}/RPMTMP/RPMS
 package.SRPMSLocation = \${moduleDir}/RPMTMP/SRPMS
-$package_description$package_summary$defprops
-};
+package.preserve.libtool = false
+$package_description$package_summary$defprops};
+
 	for (@{$obsoletes{"$subsys.$module"}}) {
 		print C "package.obsoletes = $_\n";
 		print C "package.replaces = $_\n";
@@ -898,7 +927,10 @@ General options (defaults in []):
   --thrflavour=flavour
   --nothrflavour=flavour	threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg]
   --listmodules=subsys          list modules of a subsystem
+  --version=maj.min.rev-age	specify version here instead of reading version.properties
+  --branch=branch		CVS branch/etics name suffix (HEAD, branch_2_1, ...)
   --libdir=libdir		typically [lib,lib64] postfix
+  --emi				generate configurations with emi flavor in mode 'etics'
   
 Mode of operation:
   --mode={checkout|build|etics}	what to do [build]
diff --git a/org.glite.lb.utils/configure b/org.glite.lb.utils/configure
index d02462c..7706bf1 100755
--- a/org.glite.lb.utils/configure
+++ b/org.glite.lb.utils/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',
 );
 
 
@@ -117,6 +117,7 @@ my @opts = (
 	'jobid-tag=s' => \$jobid_tag,
 	'help' => \$help,
 	'libdir=s' => \$libdir,
+	'emi' => \$emi,
 );
 
 for (@nodes) {
@@ -360,8 +361,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) {
@@ -501,6 +502,15 @@ for my $ext (keys %deps_aux) {
 	'security' => 'glite-',
 );
 
+%emi_conf_prefix = (
+	'lb' => 'emi-',
+	'jp' => 'emi-',
+	'jobid' => 'emi-',
+	'lbjp-common' => 'emi-',
+	'gridsite' => '',
+	'security' => 'emi-',
+);
+
 my @k = keys %deps_aux;
 @buildroot{@k} = ('build') x ($#k+1);
 
@@ -657,22 +667,33 @@ 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}$jar{$_}.jar";
 	}
 
 	my $conf;
 	my $conftag;
+	my $confprefix;
 
 	$dwpath = "path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz\n";
+
+	if ($emi) { $confprefix = $emi_conf_prefix{$subsys} }
+	else { $confprefix = $conf_prefix{$subsys} }
+
 	if ($branch) {
-		$conf = "$conf_prefix{$subsys}${subsys}-${module}_$branch"; 
+		$conf = "$confprefix${subsys}-${module}_$branch"; 
 		$conftag = $branch;
-		$age = '0dev'; }
+		# forced low age number
+		$age = $branch eq 'HEAD' ? '0head' : '0dev'; }
 	else {
-		$conf = "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+		$conf = "$confprefix$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
 
 # XXX: gridsite hack
-		$conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : $conf; }
+		$conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : 
+			"$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; }
+	if ($emi) {
+		$age = "${age}emi";
+	} 
+
 	my $file = $output ? $output : "$conf.ini";
 	open C,">$file" or die "$file: $!\n";
 
@@ -734,6 +755,13 @@ sub mode_etics {
 		$defprops .= $p . ' = ' . $platform_properties{"$subsys.$module"}->{default}->{$p} . "\n";
 	}
 
+	my $checkoutcmd;
+	if ($conftag eq 'HEAD') {
+		$checkoutcmd = "cvs -d \${vcsroot} co -A \${moduleName}";
+	} else {
+		$checkoutcmd = "cvs -d \${vcsroot} co -r \${tag} \${moduleName}";
+	}
+
 	print STDERR "Writing $file\n";
 	print C qq{
 [Configuration-$conf]
@@ -753,7 +781,7 @@ description = None
 tag = cvs -d \${vcsroot} tag -R \${tag} \${moduleName}
 branch = None
 commit = None
-checkout = cvs -d \${vcsroot} co -r \${tag} \${moduleName}
+checkout = $checkoutcmd
 
 [Platform-default:BuildCommand]
 postpublish = None
@@ -776,8 +804,9 @@ $buildroot
 aprSuffix = 0
 package.RPMSLocation = \${moduleDir}/RPMTMP/RPMS
 package.SRPMSLocation = \${moduleDir}/RPMTMP/SRPMS
-$package_description$package_summary$defprops
-};
+package.preserve.libtool = false
+$package_description$package_summary$defprops};
+
 	for (@{$obsoletes{"$subsys.$module"}}) {
 		print C "package.obsoletes = $_\n";
 		print C "package.replaces = $_\n";
@@ -898,7 +927,10 @@ General options (defaults in []):
   --thrflavour=flavour
   --nothrflavour=flavour	threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg]
   --listmodules=subsys          list modules of a subsystem
+  --version=maj.min.rev-age	specify version here instead of reading version.properties
+  --branch=branch		CVS branch/etics name suffix (HEAD, branch_2_1, ...)
   --libdir=libdir		typically [lib,lib64] postfix
+  --emi				generate configurations with emi flavor in mode 'etics'
   
 Mode of operation:
   --mode={checkout|build|etics}	what to do [build]
diff --git a/org.glite.lb.ws-test/configure b/org.glite.lb.ws-test/configure
index d02462c..7706bf1 100755
--- a/org.glite.lb.ws-test/configure
+++ b/org.glite.lb.ws-test/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',
 );
 
 
@@ -117,6 +117,7 @@ my @opts = (
 	'jobid-tag=s' => \$jobid_tag,
 	'help' => \$help,
 	'libdir=s' => \$libdir,
+	'emi' => \$emi,
 );
 
 for (@nodes) {
@@ -360,8 +361,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) {
@@ -501,6 +502,15 @@ for my $ext (keys %deps_aux) {
 	'security' => 'glite-',
 );
 
+%emi_conf_prefix = (
+	'lb' => 'emi-',
+	'jp' => 'emi-',
+	'jobid' => 'emi-',
+	'lbjp-common' => 'emi-',
+	'gridsite' => '',
+	'security' => 'emi-',
+);
+
 my @k = keys %deps_aux;
 @buildroot{@k} = ('build') x ($#k+1);
 
@@ -657,22 +667,33 @@ 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}$jar{$_}.jar";
 	}
 
 	my $conf;
 	my $conftag;
+	my $confprefix;
 
 	$dwpath = "path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz\n";
+
+	if ($emi) { $confprefix = $emi_conf_prefix{$subsys} }
+	else { $confprefix = $conf_prefix{$subsys} }
+
 	if ($branch) {
-		$conf = "$conf_prefix{$subsys}${subsys}-${module}_$branch"; 
+		$conf = "$confprefix${subsys}-${module}_$branch"; 
 		$conftag = $branch;
-		$age = '0dev'; }
+		# forced low age number
+		$age = $branch eq 'HEAD' ? '0head' : '0dev'; }
 	else {
-		$conf = "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+		$conf = "$confprefix$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
 
 # XXX: gridsite hack
-		$conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : $conf; }
+		$conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : 
+			"$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; }
+	if ($emi) {
+		$age = "${age}emi";
+	} 
+
 	my $file = $output ? $output : "$conf.ini";
 	open C,">$file" or die "$file: $!\n";
 
@@ -734,6 +755,13 @@ sub mode_etics {
 		$defprops .= $p . ' = ' . $platform_properties{"$subsys.$module"}->{default}->{$p} . "\n";
 	}
 
+	my $checkoutcmd;
+	if ($conftag eq 'HEAD') {
+		$checkoutcmd = "cvs -d \${vcsroot} co -A \${moduleName}";
+	} else {
+		$checkoutcmd = "cvs -d \${vcsroot} co -r \${tag} \${moduleName}";
+	}
+
 	print STDERR "Writing $file\n";
 	print C qq{
 [Configuration-$conf]
@@ -753,7 +781,7 @@ description = None
 tag = cvs -d \${vcsroot} tag -R \${tag} \${moduleName}
 branch = None
 commit = None
-checkout = cvs -d \${vcsroot} co -r \${tag} \${moduleName}
+checkout = $checkoutcmd
 
 [Platform-default:BuildCommand]
 postpublish = None
@@ -776,8 +804,9 @@ $buildroot
 aprSuffix = 0
 package.RPMSLocation = \${moduleDir}/RPMTMP/RPMS
 package.SRPMSLocation = \${moduleDir}/RPMTMP/SRPMS
-$package_description$package_summary$defprops
-};
+package.preserve.libtool = false
+$package_description$package_summary$defprops};
+
 	for (@{$obsoletes{"$subsys.$module"}}) {
 		print C "package.obsoletes = $_\n";
 		print C "package.replaces = $_\n";
@@ -898,7 +927,10 @@ General options (defaults in []):
   --thrflavour=flavour
   --nothrflavour=flavour	threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg]
   --listmodules=subsys          list modules of a subsystem
+  --version=maj.min.rev-age	specify version here instead of reading version.properties
+  --branch=branch		CVS branch/etics name suffix (HEAD, branch_2_1, ...)
   --libdir=libdir		typically [lib,lib64] postfix
+  --emi				generate configurations with emi flavor in mode 'etics'
   
 Mode of operation:
   --mode={checkout|build|etics}	what to do [build]
diff --git a/org.glite.lb.yaim/configure b/org.glite.lb.yaim/configure
index d02462c..7706bf1 100644
--- a/org.glite.lb.yaim/configure
+++ b/org.glite.lb.yaim/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',
 );
 
 
@@ -117,6 +117,7 @@ my @opts = (
 	'jobid-tag=s' => \$jobid_tag,
 	'help' => \$help,
 	'libdir=s' => \$libdir,
+	'emi' => \$emi,
 );
 
 for (@nodes) {
@@ -360,8 +361,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) {
@@ -501,6 +502,15 @@ for my $ext (keys %deps_aux) {
 	'security' => 'glite-',
 );
 
+%emi_conf_prefix = (
+	'lb' => 'emi-',
+	'jp' => 'emi-',
+	'jobid' => 'emi-',
+	'lbjp-common' => 'emi-',
+	'gridsite' => '',
+	'security' => 'emi-',
+);
+
 my @k = keys %deps_aux;
 @buildroot{@k} = ('build') x ($#k+1);
 
@@ -657,22 +667,33 @@ 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}$jar{$_}.jar";
 	}
 
 	my $conf;
 	my $conftag;
+	my $confprefix;
 
 	$dwpath = "path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz\n";
+
+	if ($emi) { $confprefix = $emi_conf_prefix{$subsys} }
+	else { $confprefix = $conf_prefix{$subsys} }
+
 	if ($branch) {
-		$conf = "$conf_prefix{$subsys}${subsys}-${module}_$branch"; 
+		$conf = "$confprefix${subsys}-${module}_$branch"; 
 		$conftag = $branch;
-		$age = '0dev'; }
+		# forced low age number
+		$age = $branch eq 'HEAD' ? '0head' : '0dev'; }
 	else {
-		$conf = "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+		$conf = "$confprefix$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
 
 # XXX: gridsite hack
-		$conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : $conf; }
+		$conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : 
+			"$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; }
+	if ($emi) {
+		$age = "${age}emi";
+	} 
+
 	my $file = $output ? $output : "$conf.ini";
 	open C,">$file" or die "$file: $!\n";
 
@@ -734,6 +755,13 @@ sub mode_etics {
 		$defprops .= $p . ' = ' . $platform_properties{"$subsys.$module"}->{default}->{$p} . "\n";
 	}
 
+	my $checkoutcmd;
+	if ($conftag eq 'HEAD') {
+		$checkoutcmd = "cvs -d \${vcsroot} co -A \${moduleName}";
+	} else {
+		$checkoutcmd = "cvs -d \${vcsroot} co -r \${tag} \${moduleName}";
+	}
+
 	print STDERR "Writing $file\n";
 	print C qq{
 [Configuration-$conf]
@@ -753,7 +781,7 @@ description = None
 tag = cvs -d \${vcsroot} tag -R \${tag} \${moduleName}
 branch = None
 commit = None
-checkout = cvs -d \${vcsroot} co -r \${tag} \${moduleName}
+checkout = $checkoutcmd
 
 [Platform-default:BuildCommand]
 postpublish = None
@@ -776,8 +804,9 @@ $buildroot
 aprSuffix = 0
 package.RPMSLocation = \${moduleDir}/RPMTMP/RPMS
 package.SRPMSLocation = \${moduleDir}/RPMTMP/SRPMS
-$package_description$package_summary$defprops
-};
+package.preserve.libtool = false
+$package_description$package_summary$defprops};
+
 	for (@{$obsoletes{"$subsys.$module"}}) {
 		print C "package.obsoletes = $_\n";
 		print C "package.replaces = $_\n";
@@ -898,7 +927,10 @@ General options (defaults in []):
   --thrflavour=flavour
   --nothrflavour=flavour	threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg]
   --listmodules=subsys          list modules of a subsystem
+  --version=maj.min.rev-age	specify version here instead of reading version.properties
+  --branch=branch		CVS branch/etics name suffix (HEAD, branch_2_1, ...)
   --libdir=libdir		typically [lib,lib64] postfix
+  --emi				generate configurations with emi flavor in mode 'etics'
   
 Mode of operation:
   --mode={checkout|build|etics}	what to do [build]
-- 
1.8.2.3