Update configure scripts with newest version to enable building branch configurations.

diff --git a/org.glite.lb.client/configure b/org.glite.lb.client/configure
index b3a5b00..f63732f 100755 (executable)
--- a/org.glite.lb.client/configure
+++ b/org.glite.lb.client/configure
@@ -20,6 +20,7 @@ my $mode = 'build';
 my $help = 0;
 my $listmodules;
 my $version;
+my $branch;
 my $output;
 my $lb_tag = '';
 my $lbjp_tag = '';
@@ -28,7 +29,7 @@ my $sec_tag = '';
 my $jobid_tag = '';
 my $libdir = 'lib';
 
-my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient/;
+my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient harvester/;
 my %enable_nodes;
 my %disable_nodes;
 
@@ -46,13 +47,18 @@ my %extern_prefix = (
        voms => '/opt/glite',
        gridsite => '/opt/glite',
        lcas => '/opt/glite',
+       trustmanager => '/opt/glite',
        ant => '/usr',
        jdk => '/usr',
        libtar => '/usr',
+       axis => '/usr',
+       log4c => '/usr',
+       postgresql => '/usr'
 );
 
 my %jar = (
-       'commons-codec' => '/usr/share/java/commons-codec-1.3.jar',
+       'commons-codec' => '/usr/share/java/commons-codec.jar',
+       'commons-lang' => '/usr/share/java/commons-lang.jar',
 );
 
 
@@ -70,7 +76,7 @@ my %lbmodules = (
        'lb' => [ qw/client common doc logger server state-machine types utils ws-interface ws-test/], 
        'security' => [qw/gss gsoap-plugin/],
        'lbjp-common' => [qw/db maildir server-bones trio jp-interface/],
-       'jobid' => [qw/api-c api-cpp/],
+       'jobid' => [qw/api-c api-cpp api-java/],
        'jp' => [ qw/client doc index primary server-common ws-interface/ ],
        );
 
@@ -84,6 +90,7 @@ my @opts = (
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,
+       'branch=s' => \$branch,
        'output=s' => \$output,
        'stage=s' => \$stagedir,
        'lb-tag=s' => \$lb_tag,
@@ -121,8 +128,8 @@ if ($listmodules) {
        exit 0;
 }
 
-warn "$0: --version and --output make sense only in --mode=etics\n"
-       if ($version || $output) && $mode ne 'etics';
+warn "$0: --version, --branch and --output make sense only in --mode=etics\n"
+       if ($version || $output || $branch) && $mode ne 'etics';
 
 my $en;
 for (keys %enable_nodes) { $en = 1 if $enable_nodes{$_}; }
@@ -294,8 +301,8 @@ sub mode_checkout() {
 BEGIN{
 %need_externs_aux = (
        'lb.client' => [ qw/cppunit:B classads/ ],
-       'lb.client-java' => [ qw/ant:B jglobus jdk:B/ ],
-       'lb.common' => [ qw/expat cppunit:B classads/ ],
+       'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager/ ],
+       'lb.common' => [ qw/expat cares:B cppunit:B classads/ ],
        'lb.doc' => [],
        'lb.logger' => [ qw/cppunit:B/ ],
        'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql:R mysql-server:R mysql-devel:B cppunit:B gsoap:B classads voms lcas gridsite/ ],
@@ -304,13 +311,14 @@ BEGIN{
        'lb.ws-interface' => [],
        'lb.ws-test' => [ qw/gsoap:B/ ],
        'lb.types' => [ qw// ],
-       'lbjp-common.db' => [ qw/mysql:R mysql-devel:B/ ],
+       'lb.harvester' => [ qw/postgresql:R/ ],
+       'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
        'lbjp-common.trio' => [ qw/cppunit:B/ ],
        'lbjp-common.jp-interface' => [ qw/cppunit:B/ ],
        'security.gss' =>  [ qw/globus_essentials:R globus:B cares cppunit:B/ ],
-       'security.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares gsoap:B/ ],
+       'security.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares:B gsoap:B/ ],
        'jobid.api-c' =>  [ qw/cppunit:B/ ],
        'jobid.api-cpp' =>  [ qw/cppunit:B/ ],
        'jobid.api-java' =>  [ qw/ant:B jdk:B/ ],
@@ -333,6 +341,7 @@ for my $ext (keys %need_externs_aux) {
 
 %need_jars = (
        'jobid.api-java' => [ qw/commons-codec/ ],
+       'lb.client-java' => [ qw/commons-lang/ ],
 );
 
 for my $jar (keys %need_jars) {
@@ -350,6 +359,7 @@ for my $jar (keys %need_jars) {
        / ],
        'lb.client-java' => [ qw/
                lb.types:B
+               lb.ws-interface:B
                jobid.api-java
        / ],
        'lb.common' => [ qw/
@@ -379,6 +389,10 @@ for my $jar (keys %need_jars) {
        'lb.ws-test' => [ qw/security.gsoap-plugin lb.ws-interface/ ],
        'lb.ws-interface' => [ qw/lb.types:B/ ],
        'lb.types' => [ qw// ],
+       'lb.harvester' => [ qw/
+               jobid.api-c lbjp-common.trio lbjp-common.db lb.common lb.client
+               security.gss
+       / ],
        'lbjp-common.db' => [ qw/lbjp-common.trio/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
@@ -451,7 +465,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.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
 security.gss security.gsoap-plugin
 jobid.api-c jobid.api-cpp jobid.api-java
 lbjp-common.db lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface
@@ -517,6 +531,7 @@ BEGIN{
                voms=>'org.glite.security.voms-api-cpp',
                gridsite=>'org.gridsite.shared',
                lcas=>'org.glite.security.lcas',
+               trustmanager=>'org.glite.security.trustmanager',
        );
        %etics_projects = (
                vdt=>[qw/globus globus_essentials/],
@@ -566,8 +581,16 @@ sub mode_etics {
                push @copts,"--with-$_ \${$eext.location}/$_*.jar";
        }
 
+       my $conf;
+       my $conftag;
 
-       my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
+       if ($branch) {
+               $conf = "glite-${subsys}-${module}_$branch"; 
+               $conftag = $branch; }
+       else {
+               $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+               $conftag = $conf; }
+#      my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
        my $file = $output ? $output : "$conf.ini";
        open C,">$file" or die "$file: $!\n";
 
@@ -585,7 +608,7 @@ description = org.glite.$subsys.$module
 projectName = org.glite
 age = $age
 deploymentType = None
-tag = $conf
+tag = $conftag
 version = $major.$minor.$rev
 path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz
 

diff --git a/org.glite.lb.common/configure b/org.glite.lb.common/configure
index 93e3eea..f63732f 100755 (executable)
--- a/org.glite.lb.common/configure
+++ b/org.glite.lb.common/configure
@@ -20,6 +20,7 @@ my $mode = 'build';
 my $help = 0;
 my $listmodules;
 my $version;
+my $branch;
 my $output;
 my $lb_tag = '';
 my $lbjp_tag = '';
@@ -28,7 +29,7 @@ my $sec_tag = '';
 my $jobid_tag = '';
 my $libdir = 'lib';
 
-my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient/;
+my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient harvester/;
 my %enable_nodes;
 my %disable_nodes;
 
@@ -46,13 +47,18 @@ my %extern_prefix = (
        voms => '/opt/glite',
        gridsite => '/opt/glite',
        lcas => '/opt/glite',
+       trustmanager => '/opt/glite',
        ant => '/usr',
        jdk => '/usr',
        libtar => '/usr',
+       axis => '/usr',
+       log4c => '/usr',
+       postgresql => '/usr'
 );
 
 my %jar = (
-       'commons-codec' => '/usr/share/java/commons-codec-1.3.jar',
+       'commons-codec' => '/usr/share/java/commons-codec.jar',
+       'commons-lang' => '/usr/share/java/commons-lang.jar',
 );
 
 
@@ -70,7 +76,7 @@ my %lbmodules = (
        'lb' => [ qw/client common doc logger server state-machine types utils ws-interface ws-test/], 
        'security' => [qw/gss gsoap-plugin/],
        'lbjp-common' => [qw/db maildir server-bones trio jp-interface/],
-       'jobid' => [qw/api-c api-cpp/],
+       'jobid' => [qw/api-c api-cpp api-java/],
        'jp' => [ qw/client doc index primary server-common ws-interface/ ],
        );
 
@@ -84,6 +90,7 @@ my @opts = (
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,
+       'branch=s' => \$branch,
        'output=s' => \$output,
        'stage=s' => \$stagedir,
        'lb-tag=s' => \$lb_tag,
@@ -121,8 +128,8 @@ if ($listmodules) {
        exit 0;
 }
 
-warn "$0: --version and --output make sense only in --mode=etics\n"
-       if ($version || $output) && $mode ne 'etics';
+warn "$0: --version, --branch and --output make sense only in --mode=etics\n"
+       if ($version || $output || $branch) && $mode ne 'etics';
 
 my $en;
 for (keys %enable_nodes) { $en = 1 if $enable_nodes{$_}; }
@@ -294,7 +301,7 @@ sub mode_checkout() {
 BEGIN{
 %need_externs_aux = (
        'lb.client' => [ qw/cppunit:B classads/ ],
-       'lb.client-java' => [ qw/ant:B jglobus jdk:B/ ],
+       'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager/ ],
        'lb.common' => [ qw/expat cares:B cppunit:B classads/ ],
        'lb.doc' => [],
        'lb.logger' => [ qw/cppunit:B/ ],
@@ -304,13 +311,14 @@ BEGIN{
        'lb.ws-interface' => [],
        'lb.ws-test' => [ qw/gsoap:B/ ],
        'lb.types' => [ qw// ],
-       'lbjp-common.db' => [ qw/mysql:R mysql-devel:B/ ],
+       'lb.harvester' => [ qw/postgresql:R/ ],
+       'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
        'lbjp-common.trio' => [ qw/cppunit:B/ ],
        'lbjp-common.jp-interface' => [ qw/cppunit:B/ ],
        'security.gss' =>  [ qw/globus_essentials:R globus:B cares cppunit:B/ ],
-       'security.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares gsoap:B/ ],
+       'security.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares:B gsoap:B/ ],
        'jobid.api-c' =>  [ qw/cppunit:B/ ],
        'jobid.api-cpp' =>  [ qw/cppunit:B/ ],
        'jobid.api-java' =>  [ qw/ant:B jdk:B/ ],
@@ -333,6 +341,7 @@ for my $ext (keys %need_externs_aux) {
 
 %need_jars = (
        'jobid.api-java' => [ qw/commons-codec/ ],
+       'lb.client-java' => [ qw/commons-lang/ ],
 );
 
 for my $jar (keys %need_jars) {
@@ -350,6 +359,7 @@ for my $jar (keys %need_jars) {
        / ],
        'lb.client-java' => [ qw/
                lb.types:B
+               lb.ws-interface:B
                jobid.api-java
        / ],
        'lb.common' => [ qw/
@@ -379,6 +389,10 @@ for my $jar (keys %need_jars) {
        'lb.ws-test' => [ qw/security.gsoap-plugin lb.ws-interface/ ],
        'lb.ws-interface' => [ qw/lb.types:B/ ],
        'lb.types' => [ qw// ],
+       'lb.harvester' => [ qw/
+               jobid.api-c lbjp-common.trio lbjp-common.db lb.common lb.client
+               security.gss
+       / ],
        'lbjp-common.db' => [ qw/lbjp-common.trio/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
@@ -451,7 +465,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.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
 security.gss security.gsoap-plugin
 jobid.api-c jobid.api-cpp jobid.api-java
 lbjp-common.db lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface
@@ -517,6 +531,7 @@ BEGIN{
                voms=>'org.glite.security.voms-api-cpp',
                gridsite=>'org.gridsite.shared',
                lcas=>'org.glite.security.lcas',
+               trustmanager=>'org.glite.security.trustmanager',
        );
        %etics_projects = (
                vdt=>[qw/globus globus_essentials/],
@@ -566,8 +581,16 @@ sub mode_etics {
                push @copts,"--with-$_ \${$eext.location}/$_*.jar";
        }
 
+       my $conf;
+       my $conftag;
 
-       my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
+       if ($branch) {
+               $conf = "glite-${subsys}-${module}_$branch"; 
+               $conftag = $branch; }
+       else {
+               $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+               $conftag = $conf; }
+#      my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
        my $file = $output ? $output : "$conf.ini";
        open C,">$file" or die "$file: $!\n";
 
@@ -585,7 +608,7 @@ description = org.glite.$subsys.$module
 projectName = org.glite
 age = $age
 deploymentType = None
-tag = $conf
+tag = $conftag
 version = $major.$minor.$rev
 path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz
 

diff --git a/org.glite.lb.doc/configure b/org.glite.lb.doc/configure
index 455145c..f63732f 100755 (executable)
--- a/org.glite.lb.doc/configure
+++ b/org.glite.lb.doc/configure
@@ -20,14 +20,16 @@ my $mode = 'build';
 my $help = 0;
 my $listmodules;
 my $version;
+my $branch;
 my $output;
 my $lb_tag = '';
 my $lbjp_tag = '';
 my $jp_tag = '';
 my $sec_tag = '';
 my $jobid_tag = '';
+my $libdir = 'lib';
 
-my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient/;
+my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient harvester/;
 my %enable_nodes;
 my %disable_nodes;
 
@@ -41,16 +43,22 @@ my %extern_prefix = (
        gsoap => '/usr',
        mysql => '/usr',
        'mysql-devel' => '',
+       'mysql-server' => '',
        voms => '/opt/glite',
        gridsite => '/opt/glite',
        lcas => '/opt/glite',
+       trustmanager => '/opt/glite',
        ant => '/usr',
        jdk => '/usr',
        libtar => '/usr',
+       axis => '/usr',
+       log4c => '/usr',
+       postgresql => '/usr'
 );
 
 my %jar = (
-       'commons-codec' => '/usr/share/java/commons-codec-1.3.jar',
+       'commons-codec' => '/usr/share/java/commons-codec.jar',
+       'commons-lang' => '/usr/share/java/commons-lang.jar',
 );
 
 
@@ -68,7 +76,7 @@ my %lbmodules = (
        'lb' => [ qw/client common doc logger server state-machine types utils ws-interface ws-test/], 
        'security' => [qw/gss gsoap-plugin/],
        'lbjp-common' => [qw/db maildir server-bones trio jp-interface/],
-       'jobid' => [qw/api-c api-cpp/],
+       'jobid' => [qw/api-c api-cpp api-java/],
        'jp' => [ qw/client doc index primary server-common ws-interface/ ],
        );
 
@@ -82,6 +90,7 @@ my @opts = (
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,
+       'branch=s' => \$branch,
        'output=s' => \$output,
        'stage=s' => \$stagedir,
        'lb-tag=s' => \$lb_tag,
@@ -90,6 +99,7 @@ my @opts = (
        'security-tag=s' => \$sec_tag,
        'jobid-tag=s' => \$jobid_tag,
        'help' => \$help,
+       'libdir=s' => \$libdir,
 );
 
 for (@nodes) {
@@ -108,6 +118,7 @@ my @keeparg = @ARGV;
 GetOptions @opts or die "Errors parsing command line\n";
 
 $extern_prefix{'mysql-devel'}=$extern_prefix{mysql} if $extern_prefix{'mysql-devel'} eq '';
+$extern_prefix{'mysql-server'}=$extern_prefix{mysql} if $extern_prefix{'mysql-server'} eq '';
 
 if ($help) { usage(); exit 0; }
 
@@ -117,8 +128,8 @@ if ($listmodules) {
        exit 0;
 }
 
-warn "$0: --version and --output make sense only in --mode=etics\n"
-       if ($version || $output) && $mode ne 'etics';
+warn "$0: --version, --branch and --output make sense only in --mode=etics\n"
+       if ($version || $output || $branch) && $mode ne 'etics';
 
 my $en;
 for (keys %enable_nodes) { $en = 1 if $enable_nodes{$_}; }
@@ -290,23 +301,24 @@ sub mode_checkout() {
 BEGIN{
 %need_externs_aux = (
        'lb.client' => [ qw/cppunit:B classads/ ],
-       'lb.client-java' => [ qw/ant:B jglobus jdk:B/ ],
-       'lb.common' => [ qw/expat cppunit:B classads/ ],
+       'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager/ ],
+       'lb.common' => [ qw/expat cares:B cppunit:B classads/ ],
        'lb.doc' => [],
        'lb.logger' => [ qw/cppunit:B/ ],
-       'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql cppunit:B gsoap:B classads voms lcas gridsite/ ],
+       'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql:R mysql-server:R mysql-devel:B cppunit:B gsoap:B classads voms lcas gridsite/ ],
        'lb.state-machine' => [ qw/classads/ ],
        'lb.utils' => [ qw/cppunit:B/ ],
        'lb.ws-interface' => [],
        'lb.ws-test' => [ qw/gsoap:B/ ],
        'lb.types' => [ qw// ],
-       'lbjp-common.db' => [ qw/mysql:R mysql-devel:B/ ],
+       'lb.harvester' => [ qw/postgresql:R/ ],
+       'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
        'lbjp-common.trio' => [ qw/cppunit:B/ ],
        'lbjp-common.jp-interface' => [ qw/cppunit:B/ ],
        'security.gss' =>  [ qw/globus_essentials:R globus:B cares cppunit:B/ ],
-       'security.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares gsoap:B/ ],
+       'security.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares:B gsoap:B/ ],
        'jobid.api-c' =>  [ qw/cppunit:B/ ],
        'jobid.api-cpp' =>  [ qw/cppunit:B/ ],
        'jobid.api-java' =>  [ qw/ant:B jdk:B/ ],
@@ -329,6 +341,7 @@ for my $ext (keys %need_externs_aux) {
 
 %need_jars = (
        'jobid.api-java' => [ qw/commons-codec/ ],
+       'lb.client-java' => [ qw/commons-lang/ ],
 );
 
 for my $jar (keys %need_jars) {
@@ -346,6 +359,7 @@ for my $jar (keys %need_jars) {
        / ],
        'lb.client-java' => [ qw/
                lb.types:B
+               lb.ws-interface:B
                jobid.api-java
        / ],
        'lb.common' => [ qw/
@@ -375,6 +389,10 @@ for my $jar (keys %need_jars) {
        'lb.ws-test' => [ qw/security.gsoap-plugin lb.ws-interface/ ],
        'lb.ws-interface' => [ qw/lb.types:B/ ],
        'lb.types' => [ qw// ],
+       'lb.harvester' => [ qw/
+               jobid.api-c lbjp-common.trio lbjp-common.db lb.common lb.client
+               security.gss
+       / ],
        'lbjp-common.db' => [ qw/lbjp-common.trio/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
@@ -447,7 +465,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.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
 security.gss security.gsoap-plugin
 jobid.api-c jobid.api-cpp jobid.api-java
 lbjp-common.db lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface
@@ -484,6 +502,7 @@ PREFIX = $prefix
 stagedir = $stagedir
 thrflavour = $thrflavour
 nothrflavour = $nothrflavour
+libdir = $libdir
 };
 
        for (@{$need_externs{$short}}) {
@@ -512,6 +531,7 @@ BEGIN{
                voms=>'org.glite.security.voms-api-cpp',
                gridsite=>'org.gridsite.shared',
                lcas=>'org.glite.security.lcas',
+               trustmanager=>'org.glite.security.trustmanager',
        );
        %etics_projects = (
                vdt=>[qw/globus globus_essentials/],
@@ -561,8 +581,16 @@ sub mode_etics {
                push @copts,"--with-$_ \${$eext.location}/$_*.jar";
        }
 
+       my $conf;
+       my $conftag;
 
-       my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
+       if ($branch) {
+               $conf = "glite-${subsys}-${module}_$branch"; 
+               $conftag = $branch; }
+       else {
+               $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+               $conftag = $conf; }
+#      my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
        my $file = $output ? $output : "$conf.ini";
        open C,">$file" or die "$file: $!\n";
 
@@ -580,7 +608,7 @@ description = org.glite.$subsys.$module
 projectName = org.glite
 age = $age
 deploymentType = None
-tag = $conf
+tag = $conftag
 version = $major.$minor.$rev
 path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz
 
@@ -605,7 +633,7 @@ 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} --module $subsys.$module @copts
+configure = cd $confdir && \${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]
@@ -664,6 +692,7 @@ General options (defaults in []):
   --thrflavour=flavour
   --nothrflavour=flavour       threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg]
   --listmodules=subsys          list modules of a subsystem
+  --libdir=libdir              typically [lib,lib64] postfix
   
 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 b3a5b00..f63732f 100755 (executable)
--- a/org.glite.lb.logger/configure
+++ b/org.glite.lb.logger/configure
@@ -20,6 +20,7 @@ my $mode = 'build';
 my $help = 0;
 my $listmodules;
 my $version;
+my $branch;
 my $output;
 my $lb_tag = '';
 my $lbjp_tag = '';
@@ -28,7 +29,7 @@ my $sec_tag = '';
 my $jobid_tag = '';
 my $libdir = 'lib';
 
-my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient/;
+my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient harvester/;
 my %enable_nodes;
 my %disable_nodes;
 
@@ -46,13 +47,18 @@ my %extern_prefix = (
        voms => '/opt/glite',
        gridsite => '/opt/glite',
        lcas => '/opt/glite',
+       trustmanager => '/opt/glite',
        ant => '/usr',
        jdk => '/usr',
        libtar => '/usr',
+       axis => '/usr',
+       log4c => '/usr',
+       postgresql => '/usr'
 );
 
 my %jar = (
-       'commons-codec' => '/usr/share/java/commons-codec-1.3.jar',
+       'commons-codec' => '/usr/share/java/commons-codec.jar',
+       'commons-lang' => '/usr/share/java/commons-lang.jar',
 );
 
 
@@ -70,7 +76,7 @@ my %lbmodules = (
        'lb' => [ qw/client common doc logger server state-machine types utils ws-interface ws-test/], 
        'security' => [qw/gss gsoap-plugin/],
        'lbjp-common' => [qw/db maildir server-bones trio jp-interface/],
-       'jobid' => [qw/api-c api-cpp/],
+       'jobid' => [qw/api-c api-cpp api-java/],
        'jp' => [ qw/client doc index primary server-common ws-interface/ ],
        );
 
@@ -84,6 +90,7 @@ my @opts = (
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,
+       'branch=s' => \$branch,
        'output=s' => \$output,
        'stage=s' => \$stagedir,
        'lb-tag=s' => \$lb_tag,
@@ -121,8 +128,8 @@ if ($listmodules) {
        exit 0;
 }
 
-warn "$0: --version and --output make sense only in --mode=etics\n"
-       if ($version || $output) && $mode ne 'etics';
+warn "$0: --version, --branch and --output make sense only in --mode=etics\n"
+       if ($version || $output || $branch) && $mode ne 'etics';
 
 my $en;
 for (keys %enable_nodes) { $en = 1 if $enable_nodes{$_}; }
@@ -294,8 +301,8 @@ sub mode_checkout() {
 BEGIN{
 %need_externs_aux = (
        'lb.client' => [ qw/cppunit:B classads/ ],
-       'lb.client-java' => [ qw/ant:B jglobus jdk:B/ ],
-       'lb.common' => [ qw/expat cppunit:B classads/ ],
+       'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager/ ],
+       'lb.common' => [ qw/expat cares:B cppunit:B classads/ ],
        'lb.doc' => [],
        'lb.logger' => [ qw/cppunit:B/ ],
        'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql:R mysql-server:R mysql-devel:B cppunit:B gsoap:B classads voms lcas gridsite/ ],
@@ -304,13 +311,14 @@ BEGIN{
        'lb.ws-interface' => [],
        'lb.ws-test' => [ qw/gsoap:B/ ],
        'lb.types' => [ qw// ],
-       'lbjp-common.db' => [ qw/mysql:R mysql-devel:B/ ],
+       'lb.harvester' => [ qw/postgresql:R/ ],
+       'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
        'lbjp-common.trio' => [ qw/cppunit:B/ ],
        'lbjp-common.jp-interface' => [ qw/cppunit:B/ ],
        'security.gss' =>  [ qw/globus_essentials:R globus:B cares cppunit:B/ ],
-       'security.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares gsoap:B/ ],
+       'security.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares:B gsoap:B/ ],
        'jobid.api-c' =>  [ qw/cppunit:B/ ],
        'jobid.api-cpp' =>  [ qw/cppunit:B/ ],
        'jobid.api-java' =>  [ qw/ant:B jdk:B/ ],
@@ -333,6 +341,7 @@ for my $ext (keys %need_externs_aux) {
 
 %need_jars = (
        'jobid.api-java' => [ qw/commons-codec/ ],
+       'lb.client-java' => [ qw/commons-lang/ ],
 );
 
 for my $jar (keys %need_jars) {
@@ -350,6 +359,7 @@ for my $jar (keys %need_jars) {
        / ],
        'lb.client-java' => [ qw/
                lb.types:B
+               lb.ws-interface:B
                jobid.api-java
        / ],
        'lb.common' => [ qw/
@@ -379,6 +389,10 @@ for my $jar (keys %need_jars) {
        'lb.ws-test' => [ qw/security.gsoap-plugin lb.ws-interface/ ],
        'lb.ws-interface' => [ qw/lb.types:B/ ],
        'lb.types' => [ qw// ],
+       'lb.harvester' => [ qw/
+               jobid.api-c lbjp-common.trio lbjp-common.db lb.common lb.client
+               security.gss
+       / ],
        'lbjp-common.db' => [ qw/lbjp-common.trio/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
@@ -451,7 +465,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.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
 security.gss security.gsoap-plugin
 jobid.api-c jobid.api-cpp jobid.api-java
 lbjp-common.db lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface
@@ -517,6 +531,7 @@ BEGIN{
                voms=>'org.glite.security.voms-api-cpp',
                gridsite=>'org.gridsite.shared',
                lcas=>'org.glite.security.lcas',
+               trustmanager=>'org.glite.security.trustmanager',
        );
        %etics_projects = (
                vdt=>[qw/globus globus_essentials/],
@@ -566,8 +581,16 @@ sub mode_etics {
                push @copts,"--with-$_ \${$eext.location}/$_*.jar";
        }
 
+       my $conf;
+       my $conftag;
 
-       my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
+       if ($branch) {
+               $conf = "glite-${subsys}-${module}_$branch"; 
+               $conftag = $branch; }
+       else {
+               $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+               $conftag = $conf; }
+#      my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
        my $file = $output ? $output : "$conf.ini";
        open C,">$file" or die "$file: $!\n";
 
@@ -585,7 +608,7 @@ description = org.glite.$subsys.$module
 projectName = org.glite
 age = $age
 deploymentType = None
-tag = $conf
+tag = $conftag
 version = $major.$minor.$rev
 path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz
 

diff --git a/org.glite.lb.server/configure b/org.glite.lb.server/configure
index 6c3cf92..f63732f 100755 (executable)
--- a/org.glite.lb.server/configure
+++ b/org.glite.lb.server/configure
@@ -20,6 +20,7 @@ my $mode = 'build';
 my $help = 0;
 my $listmodules;
 my $version;
+my $branch;
 my $output;
 my $lb_tag = '';
 my $lbjp_tag = '';
@@ -72,7 +73,7 @@ my %deps_type;
 my %topbuild;
 
 my %lbmodules = (
-       'lb' => [ qw/client common doc logger server state-machine types utils ws-interface ws-test harvester/], 
+       'lb' => [ qw/client common doc logger server state-machine types utils ws-interface ws-test/], 
        'security' => [qw/gss gsoap-plugin/],
        'lbjp-common' => [qw/db maildir server-bones trio jp-interface/],
        'jobid' => [qw/api-c api-cpp api-java/],
@@ -89,6 +90,7 @@ my @opts = (
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,
+       'branch=s' => \$branch,
        'output=s' => \$output,
        'stage=s' => \$stagedir,
        'lb-tag=s' => \$lb_tag,
@@ -126,8 +128,8 @@ if ($listmodules) {
        exit 0;
 }
 
-warn "$0: --version and --output make sense only in --mode=etics\n"
-       if ($version || $output) && $mode ne 'etics';
+warn "$0: --version, --branch and --output make sense only in --mode=etics\n"
+       if ($version || $output || $branch) && $mode ne 'etics';
 
 my $en;
 for (keys %enable_nodes) { $en = 1 if $enable_nodes{$_}; }
@@ -579,8 +581,16 @@ sub mode_etics {
                push @copts,"--with-$_ \${$eext.location}/$_*.jar";
        }
 
+       my $conf;
+       my $conftag;
 
-       my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
+       if ($branch) {
+               $conf = "glite-${subsys}-${module}_$branch"; 
+               $conftag = $branch; }
+       else {
+               $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+               $conftag = $conf; }
+#      my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
        my $file = $output ? $output : "$conf.ini";
        open C,">$file" or die "$file: $!\n";
 
@@ -598,7 +608,7 @@ description = org.glite.$subsys.$module
 projectName = org.glite
 age = $age
 deploymentType = None
-tag = $conf
+tag = $conftag
 version = $major.$minor.$rev
 path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz
 

diff --git a/org.glite.lb.state-machine/configure b/org.glite.lb.state-machine/configure
index 6c3cf92..f63732f 100755 (executable)
--- a/org.glite.lb.state-machine/configure
+++ b/org.glite.lb.state-machine/configure
@@ -20,6 +20,7 @@ my $mode = 'build';
 my $help = 0;
 my $listmodules;
 my $version;
+my $branch;
 my $output;
 my $lb_tag = '';
 my $lbjp_tag = '';
@@ -72,7 +73,7 @@ my %deps_type;
 my %topbuild;
 
 my %lbmodules = (
-       'lb' => [ qw/client common doc logger server state-machine types utils ws-interface ws-test harvester/], 
+       'lb' => [ qw/client common doc logger server state-machine types utils ws-interface ws-test/], 
        'security' => [qw/gss gsoap-plugin/],
        'lbjp-common' => [qw/db maildir server-bones trio jp-interface/],
        'jobid' => [qw/api-c api-cpp api-java/],
@@ -89,6 +90,7 @@ my @opts = (
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,
+       'branch=s' => \$branch,
        'output=s' => \$output,
        'stage=s' => \$stagedir,
        'lb-tag=s' => \$lb_tag,
@@ -126,8 +128,8 @@ if ($listmodules) {
        exit 0;
 }
 
-warn "$0: --version and --output make sense only in --mode=etics\n"
-       if ($version || $output) && $mode ne 'etics';
+warn "$0: --version, --branch and --output make sense only in --mode=etics\n"
+       if ($version || $output || $branch) && $mode ne 'etics';
 
 my $en;
 for (keys %enable_nodes) { $en = 1 if $enable_nodes{$_}; }
@@ -579,8 +581,16 @@ sub mode_etics {
                push @copts,"--with-$_ \${$eext.location}/$_*.jar";
        }
 
+       my $conf;
+       my $conftag;
 
-       my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
+       if ($branch) {
+               $conf = "glite-${subsys}-${module}_$branch"; 
+               $conftag = $branch; }
+       else {
+               $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+               $conftag = $conf; }
+#      my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
        my $file = $output ? $output : "$conf.ini";
        open C,">$file" or die "$file: $!\n";
 
@@ -598,7 +608,7 @@ description = org.glite.$subsys.$module
 projectName = org.glite
 age = $age
 deploymentType = None
-tag = $conf
+tag = $conftag
 version = $major.$minor.$rev
 path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz
 

diff --git a/org.glite.lb.types/configure b/org.glite.lb.types/configure
index 455145c..f63732f 100755 (executable)
--- a/org.glite.lb.types/configure
+++ b/org.glite.lb.types/configure
@@ -20,14 +20,16 @@ my $mode = 'build';
 my $help = 0;
 my $listmodules;
 my $version;
+my $branch;
 my $output;
 my $lb_tag = '';
 my $lbjp_tag = '';
 my $jp_tag = '';
 my $sec_tag = '';
 my $jobid_tag = '';
+my $libdir = 'lib';
 
-my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient/;
+my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient harvester/;
 my %enable_nodes;
 my %disable_nodes;
 
@@ -41,16 +43,22 @@ my %extern_prefix = (
        gsoap => '/usr',
        mysql => '/usr',
        'mysql-devel' => '',
+       'mysql-server' => '',
        voms => '/opt/glite',
        gridsite => '/opt/glite',
        lcas => '/opt/glite',
+       trustmanager => '/opt/glite',
        ant => '/usr',
        jdk => '/usr',
        libtar => '/usr',
+       axis => '/usr',
+       log4c => '/usr',
+       postgresql => '/usr'
 );
 
 my %jar = (
-       'commons-codec' => '/usr/share/java/commons-codec-1.3.jar',
+       'commons-codec' => '/usr/share/java/commons-codec.jar',
+       'commons-lang' => '/usr/share/java/commons-lang.jar',
 );
 
 
@@ -68,7 +76,7 @@ my %lbmodules = (
        'lb' => [ qw/client common doc logger server state-machine types utils ws-interface ws-test/], 
        'security' => [qw/gss gsoap-plugin/],
        'lbjp-common' => [qw/db maildir server-bones trio jp-interface/],
-       'jobid' => [qw/api-c api-cpp/],
+       'jobid' => [qw/api-c api-cpp api-java/],
        'jp' => [ qw/client doc index primary server-common ws-interface/ ],
        );
 
@@ -82,6 +90,7 @@ my @opts = (
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,
+       'branch=s' => \$branch,
        'output=s' => \$output,
        'stage=s' => \$stagedir,
        'lb-tag=s' => \$lb_tag,
@@ -90,6 +99,7 @@ my @opts = (
        'security-tag=s' => \$sec_tag,
        'jobid-tag=s' => \$jobid_tag,
        'help' => \$help,
+       'libdir=s' => \$libdir,
 );
 
 for (@nodes) {
@@ -108,6 +118,7 @@ my @keeparg = @ARGV;
 GetOptions @opts or die "Errors parsing command line\n";
 
 $extern_prefix{'mysql-devel'}=$extern_prefix{mysql} if $extern_prefix{'mysql-devel'} eq '';
+$extern_prefix{'mysql-server'}=$extern_prefix{mysql} if $extern_prefix{'mysql-server'} eq '';
 
 if ($help) { usage(); exit 0; }
 
@@ -117,8 +128,8 @@ if ($listmodules) {
        exit 0;
 }
 
-warn "$0: --version and --output make sense only in --mode=etics\n"
-       if ($version || $output) && $mode ne 'etics';
+warn "$0: --version, --branch and --output make sense only in --mode=etics\n"
+       if ($version || $output || $branch) && $mode ne 'etics';
 
 my $en;
 for (keys %enable_nodes) { $en = 1 if $enable_nodes{$_}; }
@@ -290,23 +301,24 @@ sub mode_checkout() {
 BEGIN{
 %need_externs_aux = (
        'lb.client' => [ qw/cppunit:B classads/ ],
-       'lb.client-java' => [ qw/ant:B jglobus jdk:B/ ],
-       'lb.common' => [ qw/expat cppunit:B classads/ ],
+       'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager/ ],
+       'lb.common' => [ qw/expat cares:B cppunit:B classads/ ],
        'lb.doc' => [],
        'lb.logger' => [ qw/cppunit:B/ ],
-       'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql cppunit:B gsoap:B classads voms lcas gridsite/ ],
+       'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql:R mysql-server:R mysql-devel:B cppunit:B gsoap:B classads voms lcas gridsite/ ],
        'lb.state-machine' => [ qw/classads/ ],
        'lb.utils' => [ qw/cppunit:B/ ],
        'lb.ws-interface' => [],
        'lb.ws-test' => [ qw/gsoap:B/ ],
        'lb.types' => [ qw// ],
-       'lbjp-common.db' => [ qw/mysql:R mysql-devel:B/ ],
+       'lb.harvester' => [ qw/postgresql:R/ ],
+       'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
        'lbjp-common.trio' => [ qw/cppunit:B/ ],
        'lbjp-common.jp-interface' => [ qw/cppunit:B/ ],
        'security.gss' =>  [ qw/globus_essentials:R globus:B cares cppunit:B/ ],
-       'security.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares gsoap:B/ ],
+       'security.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares:B gsoap:B/ ],
        'jobid.api-c' =>  [ qw/cppunit:B/ ],
        'jobid.api-cpp' =>  [ qw/cppunit:B/ ],
        'jobid.api-java' =>  [ qw/ant:B jdk:B/ ],
@@ -329,6 +341,7 @@ for my $ext (keys %need_externs_aux) {
 
 %need_jars = (
        'jobid.api-java' => [ qw/commons-codec/ ],
+       'lb.client-java' => [ qw/commons-lang/ ],
 );
 
 for my $jar (keys %need_jars) {
@@ -346,6 +359,7 @@ for my $jar (keys %need_jars) {
        / ],
        'lb.client-java' => [ qw/
                lb.types:B
+               lb.ws-interface:B
                jobid.api-java
        / ],
        'lb.common' => [ qw/
@@ -375,6 +389,10 @@ for my $jar (keys %need_jars) {
        'lb.ws-test' => [ qw/security.gsoap-plugin lb.ws-interface/ ],
        'lb.ws-interface' => [ qw/lb.types:B/ ],
        'lb.types' => [ qw// ],
+       'lb.harvester' => [ qw/
+               jobid.api-c lbjp-common.trio lbjp-common.db lb.common lb.client
+               security.gss
+       / ],
        'lbjp-common.db' => [ qw/lbjp-common.trio/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
@@ -447,7 +465,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.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
 security.gss security.gsoap-plugin
 jobid.api-c jobid.api-cpp jobid.api-java
 lbjp-common.db lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface
@@ -484,6 +502,7 @@ PREFIX = $prefix
 stagedir = $stagedir
 thrflavour = $thrflavour
 nothrflavour = $nothrflavour
+libdir = $libdir
 };
 
        for (@{$need_externs{$short}}) {
@@ -512,6 +531,7 @@ BEGIN{
                voms=>'org.glite.security.voms-api-cpp',
                gridsite=>'org.gridsite.shared',
                lcas=>'org.glite.security.lcas',
+               trustmanager=>'org.glite.security.trustmanager',
        );
        %etics_projects = (
                vdt=>[qw/globus globus_essentials/],
@@ -561,8 +581,16 @@ sub mode_etics {
                push @copts,"--with-$_ \${$eext.location}/$_*.jar";
        }
 
+       my $conf;
+       my $conftag;
 
-       my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
+       if ($branch) {
+               $conf = "glite-${subsys}-${module}_$branch"; 
+               $conftag = $branch; }
+       else {
+               $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+               $conftag = $conf; }
+#      my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
        my $file = $output ? $output : "$conf.ini";
        open C,">$file" or die "$file: $!\n";
 
@@ -580,7 +608,7 @@ description = org.glite.$subsys.$module
 projectName = org.glite
 age = $age
 deploymentType = None
-tag = $conf
+tag = $conftag
 version = $major.$minor.$rev
 path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz
 
@@ -605,7 +633,7 @@ 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} --module $subsys.$module @copts
+configure = cd $confdir && \${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]
@@ -664,6 +692,7 @@ General options (defaults in []):
   --thrflavour=flavour
   --nothrflavour=flavour       threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg]
   --listmodules=subsys          list modules of a subsystem
+  --libdir=libdir              typically [lib,lib64] postfix
   
 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 b3a5b00..f63732f 100755 (executable)
--- a/org.glite.lb.utils/configure
+++ b/org.glite.lb.utils/configure
@@ -20,6 +20,7 @@ my $mode = 'build';
 my $help = 0;
 my $listmodules;
 my $version;
+my $branch;
 my $output;
 my $lb_tag = '';
 my $lbjp_tag = '';
@@ -28,7 +29,7 @@ my $sec_tag = '';
 my $jobid_tag = '';
 my $libdir = 'lib';
 
-my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient/;
+my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient harvester/;
 my %enable_nodes;
 my %disable_nodes;
 
@@ -46,13 +47,18 @@ my %extern_prefix = (
        voms => '/opt/glite',
        gridsite => '/opt/glite',
        lcas => '/opt/glite',
+       trustmanager => '/opt/glite',
        ant => '/usr',
        jdk => '/usr',
        libtar => '/usr',
+       axis => '/usr',
+       log4c => '/usr',
+       postgresql => '/usr'
 );
 
 my %jar = (
-       'commons-codec' => '/usr/share/java/commons-codec-1.3.jar',
+       'commons-codec' => '/usr/share/java/commons-codec.jar',
+       'commons-lang' => '/usr/share/java/commons-lang.jar',
 );
 
 
@@ -70,7 +76,7 @@ my %lbmodules = (
        'lb' => [ qw/client common doc logger server state-machine types utils ws-interface ws-test/], 
        'security' => [qw/gss gsoap-plugin/],
        'lbjp-common' => [qw/db maildir server-bones trio jp-interface/],
-       'jobid' => [qw/api-c api-cpp/],
+       'jobid' => [qw/api-c api-cpp api-java/],
        'jp' => [ qw/client doc index primary server-common ws-interface/ ],
        );
 
@@ -84,6 +90,7 @@ my @opts = (
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,
+       'branch=s' => \$branch,
        'output=s' => \$output,
        'stage=s' => \$stagedir,
        'lb-tag=s' => \$lb_tag,
@@ -121,8 +128,8 @@ if ($listmodules) {
        exit 0;
 }
 
-warn "$0: --version and --output make sense only in --mode=etics\n"
-       if ($version || $output) && $mode ne 'etics';
+warn "$0: --version, --branch and --output make sense only in --mode=etics\n"
+       if ($version || $output || $branch) && $mode ne 'etics';
 
 my $en;
 for (keys %enable_nodes) { $en = 1 if $enable_nodes{$_}; }
@@ -294,8 +301,8 @@ sub mode_checkout() {
 BEGIN{
 %need_externs_aux = (
        'lb.client' => [ qw/cppunit:B classads/ ],
-       'lb.client-java' => [ qw/ant:B jglobus jdk:B/ ],
-       'lb.common' => [ qw/expat cppunit:B classads/ ],
+       'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager/ ],
+       'lb.common' => [ qw/expat cares:B cppunit:B classads/ ],
        'lb.doc' => [],
        'lb.logger' => [ qw/cppunit:B/ ],
        'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql:R mysql-server:R mysql-devel:B cppunit:B gsoap:B classads voms lcas gridsite/ ],
@@ -304,13 +311,14 @@ BEGIN{
        'lb.ws-interface' => [],
        'lb.ws-test' => [ qw/gsoap:B/ ],
        'lb.types' => [ qw// ],
-       'lbjp-common.db' => [ qw/mysql:R mysql-devel:B/ ],
+       'lb.harvester' => [ qw/postgresql:R/ ],
+       'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
        'lbjp-common.trio' => [ qw/cppunit:B/ ],
        'lbjp-common.jp-interface' => [ qw/cppunit:B/ ],
        'security.gss' =>  [ qw/globus_essentials:R globus:B cares cppunit:B/ ],
-       'security.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares gsoap:B/ ],
+       'security.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares:B gsoap:B/ ],
        'jobid.api-c' =>  [ qw/cppunit:B/ ],
        'jobid.api-cpp' =>  [ qw/cppunit:B/ ],
        'jobid.api-java' =>  [ qw/ant:B jdk:B/ ],
@@ -333,6 +341,7 @@ for my $ext (keys %need_externs_aux) {
 
 %need_jars = (
        'jobid.api-java' => [ qw/commons-codec/ ],
+       'lb.client-java' => [ qw/commons-lang/ ],
 );
 
 for my $jar (keys %need_jars) {
@@ -350,6 +359,7 @@ for my $jar (keys %need_jars) {
        / ],
        'lb.client-java' => [ qw/
                lb.types:B
+               lb.ws-interface:B
                jobid.api-java
        / ],
        'lb.common' => [ qw/
@@ -379,6 +389,10 @@ for my $jar (keys %need_jars) {
        'lb.ws-test' => [ qw/security.gsoap-plugin lb.ws-interface/ ],
        'lb.ws-interface' => [ qw/lb.types:B/ ],
        'lb.types' => [ qw// ],
+       'lb.harvester' => [ qw/
+               jobid.api-c lbjp-common.trio lbjp-common.db lb.common lb.client
+               security.gss
+       / ],
        'lbjp-common.db' => [ qw/lbjp-common.trio/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
@@ -451,7 +465,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.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
 security.gss security.gsoap-plugin
 jobid.api-c jobid.api-cpp jobid.api-java
 lbjp-common.db lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface
@@ -517,6 +531,7 @@ BEGIN{
                voms=>'org.glite.security.voms-api-cpp',
                gridsite=>'org.gridsite.shared',
                lcas=>'org.glite.security.lcas',
+               trustmanager=>'org.glite.security.trustmanager',
        );
        %etics_projects = (
                vdt=>[qw/globus globus_essentials/],
@@ -566,8 +581,16 @@ sub mode_etics {
                push @copts,"--with-$_ \${$eext.location}/$_*.jar";
        }
 
+       my $conf;
+       my $conftag;
 
-       my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
+       if ($branch) {
+               $conf = "glite-${subsys}-${module}_$branch"; 
+               $conftag = $branch; }
+       else {
+               $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+               $conftag = $conf; }
+#      my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
        my $file = $output ? $output : "$conf.ini";
        open C,">$file" or die "$file: $!\n";
 
@@ -585,7 +608,7 @@ description = org.glite.$subsys.$module
 projectName = org.glite
 age = $age
 deploymentType = None
-tag = $conf
+tag = $conftag
 version = $major.$minor.$rev
 path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz
 

diff --git a/org.glite.lb.ws-interface/configure b/org.glite.lb.ws-interface/configure
index 455145c..f63732f 100755 (executable)
--- a/org.glite.lb.ws-interface/configure
+++ b/org.glite.lb.ws-interface/configure
@@ -20,14 +20,16 @@ my $mode = 'build';
 my $help = 0;
 my $listmodules;
 my $version;
+my $branch;
 my $output;
 my $lb_tag = '';
 my $lbjp_tag = '';
 my $jp_tag = '';
 my $sec_tag = '';
 my $jobid_tag = '';
+my $libdir = 'lib';
 
-my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient/;
+my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient harvester/;
 my %enable_nodes;
 my %disable_nodes;
 
@@ -41,16 +43,22 @@ my %extern_prefix = (
        gsoap => '/usr',
        mysql => '/usr',
        'mysql-devel' => '',
+       'mysql-server' => '',
        voms => '/opt/glite',
        gridsite => '/opt/glite',
        lcas => '/opt/glite',
+       trustmanager => '/opt/glite',
        ant => '/usr',
        jdk => '/usr',
        libtar => '/usr',
+       axis => '/usr',
+       log4c => '/usr',
+       postgresql => '/usr'
 );
 
 my %jar = (
-       'commons-codec' => '/usr/share/java/commons-codec-1.3.jar',
+       'commons-codec' => '/usr/share/java/commons-codec.jar',
+       'commons-lang' => '/usr/share/java/commons-lang.jar',
 );
 
 
@@ -68,7 +76,7 @@ my %lbmodules = (
        'lb' => [ qw/client common doc logger server state-machine types utils ws-interface ws-test/], 
        'security' => [qw/gss gsoap-plugin/],
        'lbjp-common' => [qw/db maildir server-bones trio jp-interface/],
-       'jobid' => [qw/api-c api-cpp/],
+       'jobid' => [qw/api-c api-cpp api-java/],
        'jp' => [ qw/client doc index primary server-common ws-interface/ ],
        );
 
@@ -82,6 +90,7 @@ my @opts = (
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,
+       'branch=s' => \$branch,
        'output=s' => \$output,
        'stage=s' => \$stagedir,
        'lb-tag=s' => \$lb_tag,
@@ -90,6 +99,7 @@ my @opts = (
        'security-tag=s' => \$sec_tag,
        'jobid-tag=s' => \$jobid_tag,
        'help' => \$help,
+       'libdir=s' => \$libdir,
 );
 
 for (@nodes) {
@@ -108,6 +118,7 @@ my @keeparg = @ARGV;
 GetOptions @opts or die "Errors parsing command line\n";
 
 $extern_prefix{'mysql-devel'}=$extern_prefix{mysql} if $extern_prefix{'mysql-devel'} eq '';
+$extern_prefix{'mysql-server'}=$extern_prefix{mysql} if $extern_prefix{'mysql-server'} eq '';
 
 if ($help) { usage(); exit 0; }
 
@@ -117,8 +128,8 @@ if ($listmodules) {
        exit 0;
 }
 
-warn "$0: --version and --output make sense only in --mode=etics\n"
-       if ($version || $output) && $mode ne 'etics';
+warn "$0: --version, --branch and --output make sense only in --mode=etics\n"
+       if ($version || $output || $branch) && $mode ne 'etics';
 
 my $en;
 for (keys %enable_nodes) { $en = 1 if $enable_nodes{$_}; }
@@ -290,23 +301,24 @@ sub mode_checkout() {
 BEGIN{
 %need_externs_aux = (
        'lb.client' => [ qw/cppunit:B classads/ ],
-       'lb.client-java' => [ qw/ant:B jglobus jdk:B/ ],
-       'lb.common' => [ qw/expat cppunit:B classads/ ],
+       'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager/ ],
+       'lb.common' => [ qw/expat cares:B cppunit:B classads/ ],
        'lb.doc' => [],
        'lb.logger' => [ qw/cppunit:B/ ],
-       'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql cppunit:B gsoap:B classads voms lcas gridsite/ ],
+       'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql:R mysql-server:R mysql-devel:B cppunit:B gsoap:B classads voms lcas gridsite/ ],
        'lb.state-machine' => [ qw/classads/ ],
        'lb.utils' => [ qw/cppunit:B/ ],
        'lb.ws-interface' => [],
        'lb.ws-test' => [ qw/gsoap:B/ ],
        'lb.types' => [ qw// ],
-       'lbjp-common.db' => [ qw/mysql:R mysql-devel:B/ ],
+       'lb.harvester' => [ qw/postgresql:R/ ],
+       'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
        'lbjp-common.trio' => [ qw/cppunit:B/ ],
        'lbjp-common.jp-interface' => [ qw/cppunit:B/ ],
        'security.gss' =>  [ qw/globus_essentials:R globus:B cares cppunit:B/ ],
-       'security.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares gsoap:B/ ],
+       'security.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares:B gsoap:B/ ],
        'jobid.api-c' =>  [ qw/cppunit:B/ ],
        'jobid.api-cpp' =>  [ qw/cppunit:B/ ],
        'jobid.api-java' =>  [ qw/ant:B jdk:B/ ],
@@ -329,6 +341,7 @@ for my $ext (keys %need_externs_aux) {
 
 %need_jars = (
        'jobid.api-java' => [ qw/commons-codec/ ],
+       'lb.client-java' => [ qw/commons-lang/ ],
 );
 
 for my $jar (keys %need_jars) {
@@ -346,6 +359,7 @@ for my $jar (keys %need_jars) {
        / ],
        'lb.client-java' => [ qw/
                lb.types:B
+               lb.ws-interface:B
                jobid.api-java
        / ],
        'lb.common' => [ qw/
@@ -375,6 +389,10 @@ for my $jar (keys %need_jars) {
        'lb.ws-test' => [ qw/security.gsoap-plugin lb.ws-interface/ ],
        'lb.ws-interface' => [ qw/lb.types:B/ ],
        'lb.types' => [ qw// ],
+       'lb.harvester' => [ qw/
+               jobid.api-c lbjp-common.trio lbjp-common.db lb.common lb.client
+               security.gss
+       / ],
        'lbjp-common.db' => [ qw/lbjp-common.trio/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
@@ -447,7 +465,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.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
 security.gss security.gsoap-plugin
 jobid.api-c jobid.api-cpp jobid.api-java
 lbjp-common.db lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface
@@ -484,6 +502,7 @@ PREFIX = $prefix
 stagedir = $stagedir
 thrflavour = $thrflavour
 nothrflavour = $nothrflavour
+libdir = $libdir
 };
 
        for (@{$need_externs{$short}}) {
@@ -512,6 +531,7 @@ BEGIN{
                voms=>'org.glite.security.voms-api-cpp',
                gridsite=>'org.gridsite.shared',
                lcas=>'org.glite.security.lcas',
+               trustmanager=>'org.glite.security.trustmanager',
        );
        %etics_projects = (
                vdt=>[qw/globus globus_essentials/],
@@ -561,8 +581,16 @@ sub mode_etics {
                push @copts,"--with-$_ \${$eext.location}/$_*.jar";
        }
 
+       my $conf;
+       my $conftag;
 
-       my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
+       if ($branch) {
+               $conf = "glite-${subsys}-${module}_$branch"; 
+               $conftag = $branch; }
+       else {
+               $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+               $conftag = $conf; }
+#      my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
        my $file = $output ? $output : "$conf.ini";
        open C,">$file" or die "$file: $!\n";
 
@@ -580,7 +608,7 @@ description = org.glite.$subsys.$module
 projectName = org.glite
 age = $age
 deploymentType = None
-tag = $conf
+tag = $conftag
 version = $major.$minor.$rev
 path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz
 
@@ -605,7 +633,7 @@ 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} --module $subsys.$module @copts
+configure = cd $confdir && \${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]
@@ -664,6 +692,7 @@ General options (defaults in []):
   --thrflavour=flavour
   --nothrflavour=flavour       threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg]
   --listmodules=subsys          list modules of a subsystem
+  --libdir=libdir              typically [lib,lib64] postfix
   
 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 3fbd147..f63732f 100755 (executable)
--- a/org.glite.lb.ws-test/configure
+++ b/org.glite.lb.ws-test/configure
@@ -20,14 +20,16 @@ my $mode = 'build';
 my $help = 0;
 my $listmodules;
 my $version;
+my $branch;
 my $output;
 my $lb_tag = '';
 my $lbjp_tag = '';
 my $jp_tag = '';
 my $sec_tag = '';
 my $jobid_tag = '';
+my $libdir = 'lib';
 
-my @nodes = qw/client server logger utils client-java doc ws-test db jpprimary jpindex jpclient/;
+my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient harvester/;
 my %enable_nodes;
 my %disable_nodes;
 
@@ -37,9 +39,11 @@ my %extern_prefix = (
        cppunit => '/usr',
        expat => '/usr',
        globus => '/opt/globus',
+       jglobus => '/opt/globus',
        gsoap => '/usr',
        mysql => '/usr',
        'mysql-devel' => '',
+       'mysql-server' => '',
        voms => '/opt/glite',
        gridsite => '/opt/glite',
        lcas => '/opt/glite',
@@ -49,6 +53,7 @@ my %extern_prefix = (
        libtar => '/usr',
        axis => '/usr',
        log4c => '/usr',
+       postgresql => '/usr'
 );
 
 my %jar = (
@@ -68,9 +73,9 @@ my %deps_type;
 my %topbuild;
 
 my %lbmodules = (
-       'lb' => [ qw/client client-java common doc logger server state-machine types utils ws-interface ws-test/], 
+       'lb' => [ qw/client common doc logger server state-machine types utils ws-interface ws-test/], 
        'security' => [qw/gss gsoap-plugin/],
-       'lbjp-common' => [qw/db log maildir server-bones trio jp-interface/],
+       'lbjp-common' => [qw/db maildir server-bones trio jp-interface/],
        'jobid' => [qw/api-c api-cpp api-java/],
        'jp' => [ qw/client doc index primary server-common ws-interface/ ],
        );
@@ -85,6 +90,7 @@ my @opts = (
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,
+       'branch=s' => \$branch,
        'output=s' => \$output,
        'stage=s' => \$stagedir,
        'lb-tag=s' => \$lb_tag,
@@ -93,6 +99,7 @@ my @opts = (
        'security-tag=s' => \$sec_tag,
        'jobid-tag=s' => \$jobid_tag,
        'help' => \$help,
+       'libdir=s' => \$libdir,
 );
 
 for (@nodes) {
@@ -111,6 +118,7 @@ my @keeparg = @ARGV;
 GetOptions @opts or die "Errors parsing command line\n";
 
 $extern_prefix{'mysql-devel'}=$extern_prefix{mysql} if $extern_prefix{'mysql-devel'} eq '';
+$extern_prefix{'mysql-server'}=$extern_prefix{mysql} if $extern_prefix{'mysql-server'} eq '';
 
 if ($help) { usage(); exit 0; }
 
@@ -120,8 +128,8 @@ if ($listmodules) {
        exit 0;
 }
 
-warn "$0: --version and --output make sense only in --mode=etics\n"
-       if ($version || $output) && $mode ne 'etics';
+warn "$0: --version, --branch and --output make sense only in --mode=etics\n"
+       if ($version || $output || $branch) && $mode ne 'etics';
 
 my $en;
 for (keys %enable_nodes) { $en = 1 if $enable_nodes{$_}; }
@@ -294,23 +302,23 @@ BEGIN{
 %need_externs_aux = (
        'lb.client' => [ qw/cppunit:B classads/ ],
        'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager/ ],
-       'lb.common' => [ qw/expat cppunit:B classads/ ],
+       'lb.common' => [ qw/expat cares:B cppunit:B classads/ ],
        'lb.doc' => [],
-       'lb.logger' => [ qw/cppunit:B log4c/ ],
-       'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql cppunit:B gsoap:B classads voms lcas gridsite log4c/ ],
+       'lb.logger' => [ qw/cppunit:B/ ],
+       'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql:R mysql-server:R mysql-devel:B cppunit:B gsoap:B classads voms lcas gridsite/ ],
        'lb.state-machine' => [ qw/classads/ ],
        'lb.utils' => [ qw/cppunit:B/ ],
        'lb.ws-interface' => [],
        'lb.ws-test' => [ qw/gsoap:B/ ],
        'lb.types' => [ qw// ],
-       'lbjp-common.db' => [ qw/mysql:R mysql-devel:B/ ],
-       'lbjp-common.log' => [ qw// ],
+       'lb.harvester' => [ qw/postgresql:R/ ],
+       'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
        'lbjp-common.trio' => [ qw/cppunit:B/ ],
        'lbjp-common.jp-interface' => [ qw/cppunit:B/ ],
        'security.gss' =>  [ qw/globus_essentials:R globus:B cares cppunit:B/ ],
-       'security.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares gsoap:B/ ],
+       'security.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares:B gsoap:B/ ],
        'jobid.api-c' =>  [ qw/cppunit:B/ ],
        'jobid.api-cpp' =>  [ qw/cppunit:B/ ],
        'jobid.api-java' =>  [ qw/ant:B jdk:B/ ],
@@ -361,18 +369,17 @@ for my $jar (keys %need_jars) {
        'lb.doc' => [ qw/lb.types:B/ ],
        'lb.logger' => [ qw/
                lbjp-common.trio
-               lbjp-common.log
                jobid.api-c
                lb.common
                security.gss
        / ],
        'lb.server' => [ qw/
                lb.ws-interface lb.types:B lb.common lb.state-machine
-               lbjp-common.db lbjp-common.server-bones lbjp-common.trio lbjp-common.maildir lbjp-common.log
+               lbjp-common.db lbjp-common.server-bones lbjp-common.trio lbjp-common.maildir
                jobid.api-c
                security.gsoap-plugin security.gss
        / ],
-       'lb.state-machine' => [ qw/lb.common lbjp-common.jp-interface security.gss/ ],
+       'lb.state-machine' => [ qw/lb.types:B lb.common lbjp-common.jp-interface security.gss/ ],
        'lb.utils' => [ qw/
                lbjp-common.jp-interface
                jobid.api-c
@@ -382,6 +389,10 @@ for my $jar (keys %need_jars) {
        'lb.ws-test' => [ qw/security.gsoap-plugin lb.ws-interface/ ],
        'lb.ws-interface' => [ qw/lb.types:B/ ],
        'lb.types' => [ qw// ],
+       'lb.harvester' => [ qw/
+               jobid.api-c lbjp-common.trio lbjp-common.db lb.common lb.client
+               security.gss
+       / ],
        'lbjp-common.db' => [ qw/lbjp-common.trio/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
@@ -439,7 +450,7 @@ for my $ext (keys %deps_aux) {
        jpclient => 'jp.client',
 );
 
-my @t = qw/lb.client-java jobid.api-java lb.types lbjp-common.log/;
+my @t = qw/lb.client-java jobid.api-java lb.types/;
 @topbuild{@t} = (1) x ($#t+1);
 }
 
@@ -454,10 +465,10 @@ 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.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
 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
+lbjp-common.db lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface
 jp.client jp.doc jp.index jp.primary jp.server-common jp.ws-interface
 /;
        @aux{@m} = (1) x ($#m+1);
@@ -491,6 +502,7 @@ PREFIX = $prefix
 stagedir = $stagedir
 thrflavour = $thrflavour
 nothrflavour = $nothrflavour
+libdir = $libdir
 };
 
        for (@{$need_externs{$short}}) {
@@ -569,8 +581,16 @@ sub mode_etics {
                push @copts,"--with-$_ \${$eext.location}/$_*.jar";
        }
 
+       my $conf;
+       my $conftag;
 
-       my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
+       if ($branch) {
+               $conf = "glite-${subsys}-${module}_$branch"; 
+               $conftag = $branch; }
+       else {
+               $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
+               $conftag = $conf; }
+#      my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
        my $file = $output ? $output : "$conf.ini";
        open C,">$file" or die "$file: $!\n";
 
@@ -588,7 +608,7 @@ description = org.glite.$subsys.$module
 projectName = org.glite
 age = $age
 deploymentType = None
-tag = $conf
+tag = $conftag
 version = $major.$minor.$rev
 path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz
 
@@ -613,7 +633,7 @@ 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} --module $subsys.$module @copts
+configure = cd $confdir && \${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]
@@ -672,6 +692,7 @@ General options (defaults in []):
   --thrflavour=flavour
   --nothrflavour=flavour       threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg]
   --listmodules=subsys          list modules of a subsystem
+  --libdir=libdir              typically [lib,lib64] postfix
   
 Mode of operation:
   --mode={checkout|build|etics}        what to do [build]