The most recent version copied. Do not modify this instance (RW in ./org.glite.lb).

diff --git a/org.glite.lbjp-common.db/configure b/org.glite.lbjp-common.db/configure
index 90b22ef..c059fa4 100755 (executable)
--- a/org.glite.lbjp-common.db/configure
+++ b/org.glite.lbjp-common.db/configure
@@ -21,6 +21,10 @@ my $help = 0;
 my $listmodules;
 my $version;
 my $output;
+my $lb_tag = '';
+my $lbjp_tag = '';
+my $sec_tag = '';
+my $jobid_tag = '';
 
 my @nodes = qw/client server logger utils client-java doc ws-test/;
 my %enable_nodes;
@@ -57,7 +61,7 @@ my %topbuild;
 my %lbmodules = (
        'lb' => [ qw/client client-java 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/],
+       'lbjp-common' => [qw/db maildir server-bones trio jp-interface/],
        'jobid' => [qw/api-c api-cpp api-java/],
        );
 
@@ -73,6 +77,10 @@ my @opts = (
        'version=s' => \$version,
        'output=s' => \$output,
        'stage=s' => \$stagedir,
+       'lb-tag=s' => \$lb_tag,
+       'lbjp-common-tag=s' => \$lbjp_tag,
+       'security-tag=s' => \$sec_tag,
+       'jobid-tag=s' => \$jobid_tag,
        'help' => \$help,
 );
 
@@ -222,9 +230,42 @@ sub mode_build {
        
 sub mode_checkout() {
        for (@modules) {
+               my $module = $_;
+               my $tag = "";
+               if ($lb_tag){
+                       for (@{$lbmodules{lb}}){
+                               if ("lb.".$_ eq $module){
+                                       $tag = '-r '.$lb_tag;
+                               }
+                       }       
+               }
+               if ($lbjp_tag){
+                       for (@{$lbmodules{'lbjp-common'}}){
+                               if ("lbjp-common.".$_ eq $module){
+                                        $tag = '-r '.$lbjp_tag;
+                                }
+                       }
+               }
+               if ($sec_tag){
+                       for (@{$lbmodules{security}}){
+                               if ("security.".$_ eq $module){
+                                        $tag = '-r '.$sec_tag;
+                                }
+                       }
+               }
+               if ($jobid_tag){
+                       for (@{$lbmodules{jobid}}){
+                               if ("jobid.".$_ eq $module){
+                                        $tag = '-r '.$jobid_tag;
+                                }
+                       }
+               }
+               #if (grep {"lb.".$_ eq $module} @{$lbmodules{lb}}){
+               #       print "found";
+               #}
                $_ = full($_);
                print "\n*** Checking out $_\n";
-               system("cvs checkout $_") == 0 or die "cvs checkout $_: $?\n";
+               system("cvs checkout  $tag $_") == 0 or die "cvs checkout $tag $_: $?\n";
        }
 }
 
@@ -244,6 +285,7 @@ BEGIN{
        '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 cares cppunit:B/ ],
        'security.gsoap-plugin' =>  [ qw/cppunit:B globus cares gsoap:B/ ],
        'jobid.api-c' =>  [ qw/cppunit:B/ ],
@@ -298,9 +340,9 @@ for my $jar (keys %need_jars) {
                jobid.api-c
                security.gsoap-plugin security.gss
        / ],
-       'lb.state-machine' => [ qw/lb.common jp.common security.gss/ ],
+       'lb.state-machine' => [ qw/lb.common lbjp-common.jp-interface security.gss/ ],
        'lb.utils' => [ qw/
-               jp.common
+               lbjp-common.jp-interface
                jobid.api-c
                lbjp-common.trio lbjp-common.maildir
                lb.client lb.state-machine
@@ -318,7 +360,7 @@ for my $jar (keys %need_jars) {
        'jobid.api-cpp' =>  [ qw/jobid.api-c/ ],
        'jobid.api-java' =>  [ qw// ],
 
-       'jp.common' => [ qw/lbjp-common.db/ ],
+       'lbjp-common.jp-interface' => [ qw/lbjp-common.db jobid.api-c/ ],
 );
 
 for my $ext (keys %deps_aux) {
@@ -353,8 +395,8 @@ sub mkinc
 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
 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
-jp.common/;
+lbjp-common.db lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface
+/;
        @aux{@m} = (1) x ($#m+1);
 
        my $short = shift;
@@ -504,7 +546,7 @@ init = None
 install = make install
 clean = make clean
 test = make check
-configure = cd $confdir && \${moduleName}/configure --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} --module $subsys.$module @copts
 checkstyle = None
 
 [Platform-default:Property]
@@ -572,6 +614,10 @@ What to build:
   --enable-NODE                        build this "node" (set of modules) only. Available nodes are
                                        @{$lbmodules{lb}},@{$lbmodules{security}}
   --disable-NODE               don't build this node
+  --lb-tag=tag                 checkout LB modules with specific tag
+  --lbjp-common-tag=tag         checkout lbjp-common modules with specific tag
+  --security-tag=tag           checkout security modules with specific tag
+  --jobid-tag=tag              checkout jobid modules with specific tag
 
 Dependencies:
   --with-EXTERNAL=PATH         where to look for an external. Required externals

diff --git a/org.glite.lbjp-common.jp-interface/configure b/org.glite.lbjp-common.jp-interface/configure
index e58d090..c059fa4 100755 (executable)
--- a/org.glite.lbjp-common.jp-interface/configure
+++ b/org.glite.lbjp-common.jp-interface/configure
@@ -21,6 +21,10 @@ my $help = 0;
 my $listmodules;
 my $version;
 my $output;
+my $lb_tag = '';
+my $lbjp_tag = '';
+my $sec_tag = '';
+my $jobid_tag = '';
 
 my @nodes = qw/client server logger utils client-java doc ws-test/;
 my %enable_nodes;
@@ -73,6 +77,10 @@ my @opts = (
        'version=s' => \$version,
        'output=s' => \$output,
        'stage=s' => \$stagedir,
+       'lb-tag=s' => \$lb_tag,
+       'lbjp-common-tag=s' => \$lbjp_tag,
+       'security-tag=s' => \$sec_tag,
+       'jobid-tag=s' => \$jobid_tag,
        'help' => \$help,
 );
 
@@ -222,9 +230,42 @@ sub mode_build {
        
 sub mode_checkout() {
        for (@modules) {
+               my $module = $_;
+               my $tag = "";
+               if ($lb_tag){
+                       for (@{$lbmodules{lb}}){
+                               if ("lb.".$_ eq $module){
+                                       $tag = '-r '.$lb_tag;
+                               }
+                       }       
+               }
+               if ($lbjp_tag){
+                       for (@{$lbmodules{'lbjp-common'}}){
+                               if ("lbjp-common.".$_ eq $module){
+                                        $tag = '-r '.$lbjp_tag;
+                                }
+                       }
+               }
+               if ($sec_tag){
+                       for (@{$lbmodules{security}}){
+                               if ("security.".$_ eq $module){
+                                        $tag = '-r '.$sec_tag;
+                                }
+                       }
+               }
+               if ($jobid_tag){
+                       for (@{$lbmodules{jobid}}){
+                               if ("jobid.".$_ eq $module){
+                                        $tag = '-r '.$jobid_tag;
+                                }
+                       }
+               }
+               #if (grep {"lb.".$_ eq $module} @{$lbmodules{lb}}){
+               #       print "found";
+               #}
                $_ = full($_);
                print "\n*** Checking out $_\n";
-               system("cvs checkout $_") == 0 or die "cvs checkout $_: $?\n";
+               system("cvs checkout  $tag $_") == 0 or die "cvs checkout $tag $_: $?\n";
        }
 }
 
@@ -505,7 +546,7 @@ init = None
 install = make install
 clean = make clean
 test = make check
-configure = cd $confdir && \${moduleName}/configure --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} --module $subsys.$module @copts
 checkstyle = None
 
 [Platform-default:Property]
@@ -573,6 +614,10 @@ What to build:
   --enable-NODE                        build this "node" (set of modules) only. Available nodes are
                                        @{$lbmodules{lb}},@{$lbmodules{security}}
   --disable-NODE               don't build this node
+  --lb-tag=tag                 checkout LB modules with specific tag
+  --lbjp-common-tag=tag         checkout lbjp-common modules with specific tag
+  --security-tag=tag           checkout security modules with specific tag
+  --jobid-tag=tag              checkout jobid modules with specific tag
 
 Dependencies:
   --with-EXTERNAL=PATH         where to look for an external. Required externals

diff --git a/org.glite.lbjp-common.maildir/configure b/org.glite.lbjp-common.maildir/configure
index 87d1171..c059fa4 100755 (executable)
--- a/org.glite.lbjp-common.maildir/configure
+++ b/org.glite.lbjp-common.maildir/configure
@@ -11,6 +11,7 @@ use Getopt::Long;
 
 my $pwd = `pwd`; chomp $pwd;
 my $prefix = $pwd.'/stage';
+my $stagedir;
 my $staged;
 my $module;
 my $thrflavour = 'gcc64dbgpthr';
@@ -20,6 +21,10 @@ my $help = 0;
 my $listmodules;
 my $version;
 my $output;
+my $lb_tag = '';
+my $lbjp_tag = '';
+my $sec_tag = '';
+my $jobid_tag = '';
 
 my @nodes = qw/client server logger utils client-java doc ws-test/;
 my %enable_nodes;
@@ -56,7 +61,7 @@ my %topbuild;
 my %lbmodules = (
        'lb' => [ qw/client client-java 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/],
+       'lbjp-common' => [qw/db maildir server-bones trio jp-interface/],
        'jobid' => [qw/api-c api-cpp api-java/],
        );
 
@@ -71,6 +76,11 @@ my @opts = (
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,
        'output=s' => \$output,
+       'stage=s' => \$stagedir,
+       'lb-tag=s' => \$lb_tag,
+       'lbjp-common-tag=s' => \$lbjp_tag,
+       'security-tag=s' => \$sec_tag,
+       'jobid-tag=s' => \$jobid_tag,
        'help' => \$help,
 );
 
@@ -124,6 +134,8 @@ if (!$en && !$dis) { $enable_nodes{$_} = 1 for (@nodes) } ;
 
 for (keys %enable_nodes) { delete $enable_nodes{$_} unless $enable_nodes{$_}; }
 
+$stagedir = $prefix unless $stagedir;
+
 if ($mode eq 'build') {
        print "Writing config.status\n";
        open CONF,">config.status" or die "config.status: $!\n";
@@ -218,9 +230,42 @@ sub mode_build {
        
 sub mode_checkout() {
        for (@modules) {
+               my $module = $_;
+               my $tag = "";
+               if ($lb_tag){
+                       for (@{$lbmodules{lb}}){
+                               if ("lb.".$_ eq $module){
+                                       $tag = '-r '.$lb_tag;
+                               }
+                       }       
+               }
+               if ($lbjp_tag){
+                       for (@{$lbmodules{'lbjp-common'}}){
+                               if ("lbjp-common.".$_ eq $module){
+                                        $tag = '-r '.$lbjp_tag;
+                                }
+                       }
+               }
+               if ($sec_tag){
+                       for (@{$lbmodules{security}}){
+                               if ("security.".$_ eq $module){
+                                        $tag = '-r '.$sec_tag;
+                                }
+                       }
+               }
+               if ($jobid_tag){
+                       for (@{$lbmodules{jobid}}){
+                               if ("jobid.".$_ eq $module){
+                                        $tag = '-r '.$jobid_tag;
+                                }
+                       }
+               }
+               #if (grep {"lb.".$_ eq $module} @{$lbmodules{lb}}){
+               #       print "found";
+               #}
                $_ = full($_);
                print "\n*** Checking out $_\n";
-               system("cvs checkout $_") == 0 or die "cvs checkout $_: $?\n";
+               system("cvs checkout  $tag $_") == 0 or die "cvs checkout $tag $_: $?\n";
        }
 }
 
@@ -239,7 +284,8 @@ BEGIN{
        'lbjp-common.db' => [ qw/mysql/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
-       'lbjp-common.trio' => [ qw// ],
+       'lbjp-common.trio' => [ qw/cppunit:B/ ],
+       'lbjp-common.jp-interface' => [ qw/cppunit:B/ ],
        'security.gss' =>  [ qw/globus cares cppunit:B/ ],
        'security.gsoap-plugin' =>  [ qw/cppunit:B globus cares gsoap:B/ ],
        'jobid.api-c' =>  [ qw/cppunit:B/ ],
@@ -294,9 +340,9 @@ for my $jar (keys %need_jars) {
                jobid.api-c
                security.gsoap-plugin security.gss
        / ],
-       'lb.state-machine' => [ qw/lb.common jp.common security.gss/ ],
+       'lb.state-machine' => [ qw/lb.common lbjp-common.jp-interface security.gss/ ],
        'lb.utils' => [ qw/
-               jp.common
+               lbjp-common.jp-interface
                jobid.api-c
                lbjp-common.trio lbjp-common.maildir
                lb.client lb.state-machine
@@ -314,7 +360,7 @@ for my $jar (keys %need_jars) {
        'jobid.api-cpp' =>  [ qw/jobid.api-c/ ],
        'jobid.api-java' =>  [ qw// ],
 
-       'jp.common' => [ qw/lbjp-common.db/ ],
+       'lbjp-common.jp-interface' => [ qw/lbjp-common.db jobid.api-c/ ],
 );
 
 for my $ext (keys %deps_aux) {
@@ -349,8 +395,8 @@ sub mkinc
 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
 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
-jp.common/;
+lbjp-common.db lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface
+/;
        @aux{@m} = (1) x ($#m+1);
 
        my $short = shift;
@@ -379,7 +425,7 @@ jp.common/;
 
        print MKINC qq{
 PREFIX = $prefix
-stagedir = $prefix
+stagedir = $stagedir
 thrflavour = $thrflavour
 nothrflavour = $nothrflavour
 };
@@ -500,7 +546,7 @@ init = None
 install = make install
 clean = make clean
 test = make check
-configure = cd $confdir && \${moduleName}/configure --prefix=\${prefix} --module $subsys.$module @copts
+configure = cd $confdir && \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --prefix=\${prefix} --stage=\${stageDir} --module $subsys.$module @copts
 checkstyle = None
 
 [Platform-default:Property]
@@ -568,6 +614,10 @@ What to build:
   --enable-NODE                        build this "node" (set of modules) only. Available nodes are
                                        @{$lbmodules{lb}},@{$lbmodules{security}}
   --disable-NODE               don't build this node
+  --lb-tag=tag                 checkout LB modules with specific tag
+  --lbjp-common-tag=tag         checkout lbjp-common modules with specific tag
+  --security-tag=tag           checkout security modules with specific tag
+  --jobid-tag=tag              checkout jobid modules with specific tag
 
 Dependencies:
   --with-EXTERNAL=PATH         where to look for an external. Required externals

diff --git a/org.glite.lbjp-common.server-bones/configure b/org.glite.lbjp-common.server-bones/configure
index 87d1171..c059fa4 100755 (executable)
--- a/org.glite.lbjp-common.server-bones/configure
+++ b/org.glite.lbjp-common.server-bones/configure
@@ -11,6 +11,7 @@ use Getopt::Long;
 
 my $pwd = `pwd`; chomp $pwd;
 my $prefix = $pwd.'/stage';
+my $stagedir;
 my $staged;
 my $module;
 my $thrflavour = 'gcc64dbgpthr';
@@ -20,6 +21,10 @@ my $help = 0;
 my $listmodules;
 my $version;
 my $output;
+my $lb_tag = '';
+my $lbjp_tag = '';
+my $sec_tag = '';
+my $jobid_tag = '';
 
 my @nodes = qw/client server logger utils client-java doc ws-test/;
 my %enable_nodes;
@@ -56,7 +61,7 @@ my %topbuild;
 my %lbmodules = (
        'lb' => [ qw/client client-java 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/],
+       'lbjp-common' => [qw/db maildir server-bones trio jp-interface/],
        'jobid' => [qw/api-c api-cpp api-java/],
        );
 
@@ -71,6 +76,11 @@ my @opts = (
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,
        'output=s' => \$output,
+       'stage=s' => \$stagedir,
+       'lb-tag=s' => \$lb_tag,
+       'lbjp-common-tag=s' => \$lbjp_tag,
+       'security-tag=s' => \$sec_tag,
+       'jobid-tag=s' => \$jobid_tag,
        'help' => \$help,
 );
 
@@ -124,6 +134,8 @@ if (!$en && !$dis) { $enable_nodes{$_} = 1 for (@nodes) } ;
 
 for (keys %enable_nodes) { delete $enable_nodes{$_} unless $enable_nodes{$_}; }
 
+$stagedir = $prefix unless $stagedir;
+
 if ($mode eq 'build') {
        print "Writing config.status\n";
        open CONF,">config.status" or die "config.status: $!\n";
@@ -218,9 +230,42 @@ sub mode_build {
        
 sub mode_checkout() {
        for (@modules) {
+               my $module = $_;
+               my $tag = "";
+               if ($lb_tag){
+                       for (@{$lbmodules{lb}}){
+                               if ("lb.".$_ eq $module){
+                                       $tag = '-r '.$lb_tag;
+                               }
+                       }       
+               }
+               if ($lbjp_tag){
+                       for (@{$lbmodules{'lbjp-common'}}){
+                               if ("lbjp-common.".$_ eq $module){
+                                        $tag = '-r '.$lbjp_tag;
+                                }
+                       }
+               }
+               if ($sec_tag){
+                       for (@{$lbmodules{security}}){
+                               if ("security.".$_ eq $module){
+                                        $tag = '-r '.$sec_tag;
+                                }
+                       }
+               }
+               if ($jobid_tag){
+                       for (@{$lbmodules{jobid}}){
+                               if ("jobid.".$_ eq $module){
+                                        $tag = '-r '.$jobid_tag;
+                                }
+                       }
+               }
+               #if (grep {"lb.".$_ eq $module} @{$lbmodules{lb}}){
+               #       print "found";
+               #}
                $_ = full($_);
                print "\n*** Checking out $_\n";
-               system("cvs checkout $_") == 0 or die "cvs checkout $_: $?\n";
+               system("cvs checkout  $tag $_") == 0 or die "cvs checkout $tag $_: $?\n";
        }
 }
 
@@ -239,7 +284,8 @@ BEGIN{
        'lbjp-common.db' => [ qw/mysql/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
-       'lbjp-common.trio' => [ qw// ],
+       'lbjp-common.trio' => [ qw/cppunit:B/ ],
+       'lbjp-common.jp-interface' => [ qw/cppunit:B/ ],
        'security.gss' =>  [ qw/globus cares cppunit:B/ ],
        'security.gsoap-plugin' =>  [ qw/cppunit:B globus cares gsoap:B/ ],
        'jobid.api-c' =>  [ qw/cppunit:B/ ],
@@ -294,9 +340,9 @@ for my $jar (keys %need_jars) {
                jobid.api-c
                security.gsoap-plugin security.gss
        / ],
-       'lb.state-machine' => [ qw/lb.common jp.common security.gss/ ],
+       'lb.state-machine' => [ qw/lb.common lbjp-common.jp-interface security.gss/ ],
        'lb.utils' => [ qw/
-               jp.common
+               lbjp-common.jp-interface
                jobid.api-c
                lbjp-common.trio lbjp-common.maildir
                lb.client lb.state-machine
@@ -314,7 +360,7 @@ for my $jar (keys %need_jars) {
        'jobid.api-cpp' =>  [ qw/jobid.api-c/ ],
        'jobid.api-java' =>  [ qw// ],
 
-       'jp.common' => [ qw/lbjp-common.db/ ],
+       'lbjp-common.jp-interface' => [ qw/lbjp-common.db jobid.api-c/ ],
 );
 
 for my $ext (keys %deps_aux) {
@@ -349,8 +395,8 @@ sub mkinc
 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
 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
-jp.common/;
+lbjp-common.db lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface
+/;
        @aux{@m} = (1) x ($#m+1);
 
        my $short = shift;
@@ -379,7 +425,7 @@ jp.common/;
 
        print MKINC qq{
 PREFIX = $prefix
-stagedir = $prefix
+stagedir = $stagedir
 thrflavour = $thrflavour
 nothrflavour = $nothrflavour
 };
@@ -500,7 +546,7 @@ init = None
 install = make install
 clean = make clean
 test = make check
-configure = cd $confdir && \${moduleName}/configure --prefix=\${prefix} --module $subsys.$module @copts
+configure = cd $confdir && \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --prefix=\${prefix} --stage=\${stageDir} --module $subsys.$module @copts
 checkstyle = None
 
 [Platform-default:Property]
@@ -568,6 +614,10 @@ What to build:
   --enable-NODE                        build this "node" (set of modules) only. Available nodes are
                                        @{$lbmodules{lb}},@{$lbmodules{security}}
   --disable-NODE               don't build this node
+  --lb-tag=tag                 checkout LB modules with specific tag
+  --lbjp-common-tag=tag         checkout lbjp-common modules with specific tag
+  --security-tag=tag           checkout security modules with specific tag
+  --jobid-tag=tag              checkout jobid modules with specific tag
 
 Dependencies:
   --with-EXTERNAL=PATH         where to look for an external. Required externals

diff --git a/org.glite.lbjp-common.trio/configure b/org.glite.lbjp-common.trio/configure
index 34963e4..c059fa4 100755 (executable)
--- a/org.glite.lbjp-common.trio/configure
+++ b/org.glite.lbjp-common.trio/configure
@@ -11,6 +11,7 @@ use Getopt::Long;
 
 my $pwd = `pwd`; chomp $pwd;
 my $prefix = $pwd.'/stage';
+my $stagedir;
 my $staged;
 my $module;
 my $thrflavour = 'gcc64dbgpthr';
@@ -20,6 +21,10 @@ my $help = 0;
 my $listmodules;
 my $version;
 my $output;
+my $lb_tag = '';
+my $lbjp_tag = '';
+my $sec_tag = '';
+my $jobid_tag = '';
 
 my @nodes = qw/client server logger utils client-java doc ws-test/;
 my %enable_nodes;
@@ -56,7 +61,7 @@ my %topbuild;
 my %lbmodules = (
        'lb' => [ qw/client client-java 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/],
+       'lbjp-common' => [qw/db maildir server-bones trio jp-interface/],
        'jobid' => [qw/api-c api-cpp api-java/],
        );
 
@@ -71,6 +76,11 @@ my @opts = (
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,
        'output=s' => \$output,
+       'stage=s' => \$stagedir,
+       'lb-tag=s' => \$lb_tag,
+       'lbjp-common-tag=s' => \$lbjp_tag,
+       'security-tag=s' => \$sec_tag,
+       'jobid-tag=s' => \$jobid_tag,
        'help' => \$help,
 );
 
@@ -124,6 +134,8 @@ if (!$en && !$dis) { $enable_nodes{$_} = 1 for (@nodes) } ;
 
 for (keys %enable_nodes) { delete $enable_nodes{$_} unless $enable_nodes{$_}; }
 
+$stagedir = $prefix unless $stagedir;
+
 if ($mode eq 'build') {
        print "Writing config.status\n";
        open CONF,">config.status" or die "config.status: $!\n";
@@ -218,9 +230,42 @@ sub mode_build {
        
 sub mode_checkout() {
        for (@modules) {
+               my $module = $_;
+               my $tag = "";
+               if ($lb_tag){
+                       for (@{$lbmodules{lb}}){
+                               if ("lb.".$_ eq $module){
+                                       $tag = '-r '.$lb_tag;
+                               }
+                       }       
+               }
+               if ($lbjp_tag){
+                       for (@{$lbmodules{'lbjp-common'}}){
+                               if ("lbjp-common.".$_ eq $module){
+                                        $tag = '-r '.$lbjp_tag;
+                                }
+                       }
+               }
+               if ($sec_tag){
+                       for (@{$lbmodules{security}}){
+                               if ("security.".$_ eq $module){
+                                        $tag = '-r '.$sec_tag;
+                                }
+                       }
+               }
+               if ($jobid_tag){
+                       for (@{$lbmodules{jobid}}){
+                               if ("jobid.".$_ eq $module){
+                                        $tag = '-r '.$jobid_tag;
+                                }
+                       }
+               }
+               #if (grep {"lb.".$_ eq $module} @{$lbmodules{lb}}){
+               #       print "found";
+               #}
                $_ = full($_);
                print "\n*** Checking out $_\n";
-               system("cvs checkout $_") == 0 or die "cvs checkout $_: $?\n";
+               system("cvs checkout  $tag $_") == 0 or die "cvs checkout $tag $_: $?\n";
        }
 }
 
@@ -240,6 +285,7 @@ BEGIN{
        '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 cares cppunit:B/ ],
        'security.gsoap-plugin' =>  [ qw/cppunit:B globus cares gsoap:B/ ],
        'jobid.api-c' =>  [ qw/cppunit:B/ ],
@@ -294,9 +340,9 @@ for my $jar (keys %need_jars) {
                jobid.api-c
                security.gsoap-plugin security.gss
        / ],
-       'lb.state-machine' => [ qw/lb.common jp.common security.gss/ ],
+       'lb.state-machine' => [ qw/lb.common lbjp-common.jp-interface security.gss/ ],
        'lb.utils' => [ qw/
-               jp.common
+               lbjp-common.jp-interface
                jobid.api-c
                lbjp-common.trio lbjp-common.maildir
                lb.client lb.state-machine
@@ -314,7 +360,7 @@ for my $jar (keys %need_jars) {
        'jobid.api-cpp' =>  [ qw/jobid.api-c/ ],
        'jobid.api-java' =>  [ qw// ],
 
-       'jp.common' => [ qw/lbjp-common.db/ ],
+       'lbjp-common.jp-interface' => [ qw/lbjp-common.db jobid.api-c/ ],
 );
 
 for my $ext (keys %deps_aux) {
@@ -349,8 +395,8 @@ sub mkinc
 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
 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
-jp.common/;
+lbjp-common.db lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface
+/;
        @aux{@m} = (1) x ($#m+1);
 
        my $short = shift;
@@ -379,7 +425,7 @@ jp.common/;
 
        print MKINC qq{
 PREFIX = $prefix
-stagedir = $prefix
+stagedir = $stagedir
 thrflavour = $thrflavour
 nothrflavour = $nothrflavour
 };
@@ -500,7 +546,7 @@ init = None
 install = make install
 clean = make clean
 test = make check
-configure = cd $confdir && \${moduleName}/configure --prefix=\${prefix} --module $subsys.$module @copts
+configure = cd $confdir && \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --prefix=\${prefix} --stage=\${stageDir} --module $subsys.$module @copts
 checkstyle = None
 
 [Platform-default:Property]
@@ -568,6 +614,10 @@ What to build:
   --enable-NODE                        build this "node" (set of modules) only. Available nodes are
                                        @{$lbmodules{lb}},@{$lbmodules{security}}
   --disable-NODE               don't build this node
+  --lb-tag=tag                 checkout LB modules with specific tag
+  --lbjp-common-tag=tag         checkout lbjp-common modules with specific tag
+  --security-tag=tag           checkout security modules with specific tag
+  --jobid-tag=tag              checkout jobid modules with specific tag
 
 Dependencies:
   --with-EXTERNAL=PATH         where to look for an external. Required externals

diff --git a/org.glite.security.gsoap-plugin/configure b/org.glite.security.gsoap-plugin/configure
index e58d090..c059fa4 100755 (executable)
--- a/org.glite.security.gsoap-plugin/configure
+++ b/org.glite.security.gsoap-plugin/configure
@@ -21,6 +21,10 @@ my $help = 0;
 my $listmodules;
 my $version;
 my $output;
+my $lb_tag = '';
+my $lbjp_tag = '';
+my $sec_tag = '';
+my $jobid_tag = '';
 
 my @nodes = qw/client server logger utils client-java doc ws-test/;
 my %enable_nodes;
@@ -73,6 +77,10 @@ my @opts = (
        'version=s' => \$version,
        'output=s' => \$output,
        'stage=s' => \$stagedir,
+       'lb-tag=s' => \$lb_tag,
+       'lbjp-common-tag=s' => \$lbjp_tag,
+       'security-tag=s' => \$sec_tag,
+       'jobid-tag=s' => \$jobid_tag,
        'help' => \$help,
 );
 
@@ -222,9 +230,42 @@ sub mode_build {
        
 sub mode_checkout() {
        for (@modules) {
+               my $module = $_;
+               my $tag = "";
+               if ($lb_tag){
+                       for (@{$lbmodules{lb}}){
+                               if ("lb.".$_ eq $module){
+                                       $tag = '-r '.$lb_tag;
+                               }
+                       }       
+               }
+               if ($lbjp_tag){
+                       for (@{$lbmodules{'lbjp-common'}}){
+                               if ("lbjp-common.".$_ eq $module){
+                                        $tag = '-r '.$lbjp_tag;
+                                }
+                       }
+               }
+               if ($sec_tag){
+                       for (@{$lbmodules{security}}){
+                               if ("security.".$_ eq $module){
+                                        $tag = '-r '.$sec_tag;
+                                }
+                       }
+               }
+               if ($jobid_tag){
+                       for (@{$lbmodules{jobid}}){
+                               if ("jobid.".$_ eq $module){
+                                        $tag = '-r '.$jobid_tag;
+                                }
+                       }
+               }
+               #if (grep {"lb.".$_ eq $module} @{$lbmodules{lb}}){
+               #       print "found";
+               #}
                $_ = full($_);
                print "\n*** Checking out $_\n";
-               system("cvs checkout $_") == 0 or die "cvs checkout $_: $?\n";
+               system("cvs checkout  $tag $_") == 0 or die "cvs checkout $tag $_: $?\n";
        }
 }
 
@@ -505,7 +546,7 @@ init = None
 install = make install
 clean = make clean
 test = make check
-configure = cd $confdir && \${moduleName}/configure --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} --module $subsys.$module @copts
 checkstyle = None
 
 [Platform-default:Property]
@@ -573,6 +614,10 @@ What to build:
   --enable-NODE                        build this "node" (set of modules) only. Available nodes are
                                        @{$lbmodules{lb}},@{$lbmodules{security}}
   --disable-NODE               don't build this node
+  --lb-tag=tag                 checkout LB modules with specific tag
+  --lbjp-common-tag=tag         checkout lbjp-common modules with specific tag
+  --security-tag=tag           checkout security modules with specific tag
+  --jobid-tag=tag              checkout jobid modules with specific tag
 
 Dependencies:
   --with-EXTERNAL=PATH         where to look for an external. Required externals