diff options
| author | jdennis <jdennis@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-03-01 23:04:40 +0000 |
|---|---|---|
| committer | jdennis <jdennis@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-03-01 23:04:40 +0000 |
| commit | b0b10a79e529ee35f024f1b7bb5be7b308487a0e (patch) | |
| tree | a4e8e85221dff229adf00e6ac8b5b059c013b141 | |
| parent | 66ea690d436b0a59d81300fce53fee2c18ab8b4e (diff) | |
| download | pki-b0b10a79e529ee35f024f1b7bb5be7b308487a0e.tar.gz pki-b0b10a79e529ee35f024f1b7bb5be7b308487a0e.tar.xz pki-b0b10a79e529ee35f024f1b7bb5be7b308487a0e.zip | |
fix bz 680420
add xml-commons-apis jar
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1874 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
| -rwxr-xr-x | pki/base/setup/pkicreate | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pki/base/setup/pkicreate b/pki/base/setup/pkicreate index 12179a7a9..46ee97ad2 100755 --- a/pki/base/setup/pkicreate +++ b/pki/base/setup/pkicreate @@ -192,6 +192,7 @@ my $apache_commons_logging_jar_base_name = "apache-commons-logging.jar"; my $jakarta_commons_logging_jar_base_name = "jakarta-commons-logging.jar"; my $apache_commons_lang_jar_base_name = "apache-commons-lang.jar"; my $jakarta_commons_lang_jar_base_name = "jakarta-commons-lang.jar"; +my $xml_commons_apis_jar_base_name = "xml-commons-apis.jar"; my $conf_base_name = "conf"; # CA, KRA, OCSP, TKS, my $catalina_properties_base_name = "catalina.properties"; # CA, KRA, OCSP, TKS @@ -474,6 +475,8 @@ my $velocity_jar_file_path = undef; # CA, KRA, OCSP, TKS my $velocity_jar_symlink_path = undef; # CA, KRA, OCSP, TKS my $xerces_jar_file_path = undef; # CA, KRA, OCSP, TKS my $xerces_jar_symlink_path = undef; # CA, KRA, OCSP, TKS +my $xml_commons_apis_jar_file_path = undef; # CA, KRA, OCSP, TKS +my $xml_commons_apis_jar_symlink_path = undef; # CA, KRA, OCSP, TKS my $httpd_conf_instance_file_path = undef; # RA, TPS my $httpd_conf_subsystem_file_path = undef; # RA, TPS my $index_jsp_instance_file_path = undef; # CA, KRA, OCSP, TKS @@ -1750,6 +1753,11 @@ sub initialize_subdirectory_paths return 0; } + if (!defined($xml_commons_apis_jar_file_path = find_jar($xml_commons_apis_jar_base_name))) { + emit("could not find jar: $xml_commons_apis_jar_base_name", "error"); + return 0; + } + $webinf_instance_path = $webapps_instance_path . "/" . $subsystem_type . "/" . $webinf_base_instance_dir; @@ -1798,6 +1806,8 @@ sub initialize_subdirectory_paths . "/" . $velocity_jar_base_name; $xerces_jar_symlink_path = $webinf_lib_instance_path . "/" . $xerces_jar_base_name; + $xml_commons_apis_jar_symlink_path = $webinf_lib_instance_path + . "/" . $xml_commons_apis_jar_base_name; $webapps_root_instance_path = $webapps_instance_path @@ -2740,6 +2750,10 @@ sub process_pki_files_and_symlinks return 0 if !create_symlink($xerces_jar_symlink_path, $xerces_jar_file_path, $pki_user, $pki_group); + # create instance symlink to "xml_commons_apis.jar" + return 0 if !create_symlink($xml_commons_apis_jar_symlink_path, $xml_commons_apis_jar_file_path, + $pki_user, $pki_group); + } return 1; |