diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-02-22 01:15:56 -0600 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-02-29 12:06:39 -0600 |
commit | 05f8a44b83a01ab60774a14b48c39067dc135171 (patch) | |
tree | ab6592e2ebd3767a72774878814e6fe5b1749c33 /pki/base/setup/pkicreate | |
parent | db9caadf192227d724ebf084d9ef56c865e5b969 (diff) | |
download | pki-05f8a44b83a01ab60774a14b48c39067dc135171.tar.gz pki-05f8a44b83a01ab60774a14b48c39067dc135171.tar.xz pki-05f8a44b83a01ab60774a14b48c39067dc135171.zip |
Removed dependency on OSUtil.
The OSUtil is no longer used by the code. It has been removed from
build scripts and tools.
Ticket #90
Diffstat (limited to 'pki/base/setup/pkicreate')
-rwxr-xr-x | pki/base/setup/pkicreate | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/pki/base/setup/pkicreate b/pki/base/setup/pkicreate index ea9ed9da7..e8e1b12cb 100755 --- a/pki/base/setup/pkicreate +++ b/pki/base/setup/pkicreate @@ -180,7 +180,6 @@ my $commons_logging_jar_base_name = undef; # CA, KRA, OCSP, TKS my $jss_jar_base_name = "jss4.jar"; # CA, KRA, OCSP, TKS my $ldapjdk_jar_base_name = "ldapjdk.jar"; # CA, KRA, OCSP, TKS my $pki_nsutil_jar_base_name = "pki-nsutil.jar"; # CA, KRA, OCSP, TKS -my $osutil_jar_base_name = "osutil.jar"; # CA, KRA, OCSP, TKS my $commons_codec_jar_base_name = "commons-codec.jar"; # CA, KRA, OCSP, TKS my $symkey_jar_base_name = "symkey.jar"; # CA, KRA, OCSP, TKS my $tomcatjss_jar_base_name = "tomcatjss.jar"; # CA, KRA, OCSP, TKS @@ -501,8 +500,6 @@ my $ldapjdk_jar_file_path = undef; # CA, KRA, OCSP, TKS my $ldapjdk_jar_symlink_path = undef; # CA, KRA, OCSP, TKS my $pki_nsutil_jar_file_path = undef; # CA, KRA, OCSP, TKS my $pki_nsutil_jar_symlink_path = undef; # CA, KRA, OCSP, TKS -my $osutil_jar_file_path = undef; # CA, KRA, OCSP, TKS -my $osutil_jar_symlink_path = undef; # CA, KRA, OCSP, TKS my $commons_codec_jar_file_path = undef; # CA, KRA, OCSP, TKS my $commons_codec_jar_symlink_path = undef; # CA, KRA, OCSP, TKS my $symkey_jar_file_path = undef; # CA, KRA, OCSP, TKS @@ -1836,11 +1833,6 @@ sub initialize_subdirectory_paths return 0; } - if (!defined($osutil_jar_file_path = find_jar($osutil_jar_base_name))) { - emit("could not find jar: $osutil_jar_base_name", "error"); - return 0; - } - if (!defined($commons_codec_jar_file_path = find_jar($commons_codec_jar_base_name))) { emit("could not find jar: $commons_codec_jar_base_name", "error"); return 0; @@ -1952,8 +1944,6 @@ sub initialize_subdirectory_paths . "/" . $ldapjdk_jar_base_name; $pki_nsutil_jar_symlink_path = $webinf_lib_instance_path . "/" . $pki_nsutil_jar_base_name; - $osutil_jar_symlink_path = $webinf_lib_instance_path - . "/" . $osutil_jar_base_name; $commons_codec_jar_symlink_path = $webinf_lib_instance_path . "/" . $commons_codec_jar_base_name; $symkey_jar_symlink_path = $webinf_lib_instance_path @@ -2971,10 +2961,6 @@ sub process_pki_files_and_symlinks return 0 if !create_symlink($pki_nsutil_jar_symlink_path, $pki_nsutil_jar_file_path, $pki_user, $pki_group); - # create instance symlink to "osutil.jar" - return 0 if !create_symlink($osutil_jar_symlink_path, $osutil_jar_file_path, - $pki_user, $pki_group); - # create instance symlink to "commons_codec.jar" return 0 if !create_symlink($commons_codec_jar_symlink_path, $commons_codec_jar_file_path, $pki_user, $pki_group); |