From 2ec8048a5b05fe2b5a53b0f581eab1f5ec915416 Mon Sep 17 00:00:00 2001 From: Ian Young Date: Fri, 21 Aug 2009 08:51:26 +0000 Subject: [PATCH] Extract certificate extraction utility out into a separate project and replace it in this project by the corresponding built .jar file. --- .classpath | 2 - build/ExtractCert.pm | 35 ++++++++++++++++++ build/check_locs_list.pl | 5 ++- .../extractcert/lib/sdss-extractcert-1.0.jar | Bin 0 -> 8132 bytes 4 files changed, 38 insertions(+), 4 deletions(-) create mode 100755 build/ExtractCert.pm create mode 100644 tools/extractcert/lib/sdss-extractcert-1.0.jar diff --git a/.classpath b/.classpath index fb501163..7cec603d 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,4 @@ - - diff --git a/build/ExtractCert.pm b/build/ExtractCert.pm new file mode 100755 index 00000000..ceb0c10c --- /dev/null +++ b/build/ExtractCert.pm @@ -0,0 +1,35 @@ +#!/usr/bin/perl -w + +# +# Simplified access to the ExtractCert utility. +# + +# +# extractCertCall +# +# Provides the stem of a "system" call string to access ExtractCert with the +# required extensions. +# +sub extractCertCall +{ + my $extractCertRoot = "../tools/extractcert"; + + my $res = "java"; + + # Classpath + my $classpath = ''; + while (glob "$extractCertRoot/lib/*") { + $classpath .= ':' unless $classpath eq ''; + $classpath .= $_; + } + + $res .= " -cp $classpath"; + + # Class to invoke + $res .= " uk.ac.sdss.extractcert.ExtractCert"; + $res; +} + +print ">>>" . extractCertCall . "<<<\n"; + +1; diff --git a/build/check_locs_list.pl b/build/check_locs_list.pl index 31a40a79..d48416d3 100755 --- a/build/check_locs_list.pl +++ b/build/check_locs_list.pl @@ -1,4 +1,6 @@ #!/usr/bin/perl -w + +use ExtractCert; use File::Temp qw(tempfile); use Date::Parse; use Digest::SHA1 qw(sha1 sha1_hex sha1_base64); @@ -51,8 +53,7 @@ # # Attempt certificate extraction # - system "java -classpath ../bin uk.org.ukfederation.apps.cert.ExtractCert " . - "$host $port $temp_der"; + system extractCertCall . " $host $port $temp_der"; # # If the output file doesn't exist, the extraction failed. diff --git a/tools/extractcert/lib/sdss-extractcert-1.0.jar b/tools/extractcert/lib/sdss-extractcert-1.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..47d091754cfdf4cb4736daf705115180f1b8120e GIT binary patch literal 8132 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 f{(OS}%>Tn%D}ZkP<$y3?FkmF0+Y+