diff options
| author | jdennis <jdennis@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-12-03 15:37:30 +0000 |
|---|---|---|
| committer | jdennis <jdennis@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-12-03 15:37:30 +0000 |
| commit | ccde4332f3f61083533e5a8bd8101494ded23e0a (patch) | |
| tree | be33e36c42244fe949a4ff1b96abb6b77994b962 /pki/base | |
| parent | 4d32acee2ed9d6bd9f5007c56cd2d815af257480 (diff) | |
| download | pki-ccde4332f3f61083533e5a8bd8101494ded23e0a.tar.gz pki-ccde4332f3f61083533e5a8bd8101494ded23e0a.tar.xz pki-ccde4332f3f61083533e5a8bd8101494ded23e0a.zip | |
Bug #658926
jakarta-commons-lang.jar is needed by velocity, add that link in
WEB-INF/lib. This dependency first appeared in F13.
We had been providing a link to jakarta-commons-collections.jar in
$pki_instance/common/lib but that link is not necessary since tomcat6
already provide jakarta-commons-collections.jar. So remove the
superfluous link creation, it isn't needed.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1602 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base')
| -rwxr-xr-x | pki/base/setup/pkicreate | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/pki/base/setup/pkicreate b/pki/base/setup/pkicreate index d4336e509..f9adb1d76 100755 --- a/pki/base/setup/pkicreate +++ b/pki/base/setup/pkicreate @@ -183,8 +183,8 @@ my $cmsbundle_jar_base_name = "cmsbundle.jar"; # CA, KRA, OCSP, TKS my $cmscore_jar_base_name = "cmscore.jar"; # CA, KRA, OCSP, TKS my $conf_base_name = "conf"; # CA, KRA, OCSP, TKS, -my $jakarta_commons_collections_jar_base_name = "jakarta-commons-collections.jar"; # CA, KRA, OCSP, TKS my $jakarta_commons_logging_jar_base_name = "jakarta-commons-logging.jar"; # CA, KRA, OCSP, TKS +my $jakarta_commons_lang_jar_base_name = "jakarta-commons-lang.jar"; # 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 $tomcatjss_jar_base_name = "tomcatjss.jar"; # CA, KRA, OCSP, TKS @@ -451,10 +451,10 @@ my $addTokens_ldif_instance_file_path = undef; # TPS my $addTokens_ldif_subsystem_file_path = undef; # TPS my $addVLVIndexes_ldif_instance_file_path = undef; # TPS my $addVLVIndexes_ldif_subsystem_file_path = undef; # TPS -my $jakarta_commons_collections_jar_file_path = undef; # CA, KRA, OCSP, TKS -my $jakarta_commons_collections_jar_symlink_path = undef; # CA, KRA, OCSP, TKS my $jakarta_commons_logging_jar_file_path = undef; # CA, KRA, OCSP, TKS my $jakarta_commons_logging_jar_symlink_path = undef; # CA, KRA, OCSP, TKS +my $jakarta_commons_lang_jar_file_path = undef; # CA, KRA, OCSP, TKS +my $jakarta_commons_lang_jar_symlink_path = undef; # CA, KRA, OCSP, TKS my $jss_jar_file_path = undef; # CA, KRA, OCSP, TKS my $jss_jar_symlink_path = undef; # CA, KRA, OCSP, TKS my $ldapjdk_jar_file_path = undef; # CA, KRA, OCSP, TKS @@ -1746,14 +1746,14 @@ sub initialize_subdirectory_paths . "/" . $web_xml_base_name; $catalina_properties_subsystem_file_path = $conf_subsystem_path . "/" . $catalina_properties_base_name; - $jakarta_commons_collections_jar_file_path = $default_java_path - . "/" . $jakarta_commons_collections_jar_base_name; - $jakarta_commons_collections_jar_symlink_path = $webinf_lib_instance_path - . "/" . $jakarta_commons_collections_jar_base_name; $jakarta_commons_logging_jar_file_path = $default_java_path . "/" . $jakarta_commons_logging_jar_base_name; $jakarta_commons_logging_jar_symlink_path = $tomcat_instance_common_lib_path . "/" . $jakarta_commons_logging_jar_base_name; + $jakarta_commons_lang_jar_file_path = $default_java_path + . "/" . $jakarta_commons_lang_jar_base_name; + $jakarta_commons_lang_jar_symlink_path = $webinf_lib_instance_path + . "/" . $jakarta_commons_lang_jar_base_name; $jss_jar_file_path = $default_system_jni_java_path . "/" . $jss_jar_base_name; $jss_jar_symlink_path = $tomcat_instance_common_lib_path @@ -2657,9 +2657,10 @@ sub process_pki_files_and_symlinks return 0 if !create_symlink($cmsutil_jar_symlink_path, $cmsutil_jar_file_path, $pki_user, $pki_group); - # create symlink to "jakarta-commons-collections.jar" - return 0 if !create_symlink($jakarta_commons_collections_jar_symlink_path, - $jakarta_commons_collections_jar_file_path, + # create symlink to "jakarta-commons-lang.jar" + # needed by velocity + return 0 if !create_symlink($jakarta_commons_lang_jar_symlink_path, + $jakarta_commons_lang_jar_file_path, $pki_user, $pki_group); # create symlink to "jakarta-commons-logging.jar" |