diff options
| author | jdennis <jdennis@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-03-03 22:26:07 +0000 |
|---|---|---|
| committer | jdennis <jdennis@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-03-03 22:26:07 +0000 |
| commit | c517502e2894edc0eda96b54127e7518779e292b (patch) | |
| tree | 3ba4fbf6f8f6dafb44bcde36dd011ccf4920f6a2 | |
| parent | b0b10a79e529ee35f024f1b7bb5be7b308487a0e (diff) | |
| download | pki-c517502e2894edc0eda96b54127e7518779e292b.tar.gz pki-c517502e2894edc0eda96b54127e7518779e292b.tar.xz pki-c517502e2894edc0eda96b54127e7518779e292b.zip | |
add xml-commons-apis.jar to pkisilent
add xml-commons-resolver.jar to pkicreate
add both to pkicore.spec
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1878 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
| -rwxr-xr-x | pki/base/setup/pkicreate | 14 | ||||
| -rwxr-xr-x | pki/base/silent/scripts/pkisilent | 1 | ||||
| -rw-r--r-- | pki/specs/pki-core.spec | 2 |
3 files changed, 17 insertions, 0 deletions
diff --git a/pki/base/setup/pkicreate b/pki/base/setup/pkicreate index 46ee97ad2..7d1fd20ef 100755 --- a/pki/base/setup/pkicreate +++ b/pki/base/setup/pkicreate @@ -193,6 +193,7 @@ 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 $xml_commons_resolver_jar_base_name = "xml-commons-resolver.jar"; my $conf_base_name = "conf"; # CA, KRA, OCSP, TKS, my $catalina_properties_base_name = "catalina.properties"; # CA, KRA, OCSP, TKS @@ -477,6 +478,8 @@ 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 $xml_commons_resolver_jar_file_path = undef; # CA, KRA, OCSP, TKS +my $xml_commons_resolver_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 @@ -1758,6 +1761,11 @@ sub initialize_subdirectory_paths return 0; } + if (!defined($xml_commons_resolver_jar_file_path = find_jar($xml_commons_resolver_jar_base_name))) { + emit("could not find jar: $xml_commons_resolver_jar_base_name", "error"); + return 0; + } + $webinf_instance_path = $webapps_instance_path . "/" . $subsystem_type . "/" . $webinf_base_instance_dir; @@ -1808,6 +1816,8 @@ sub initialize_subdirectory_paths . "/" . $xerces_jar_base_name; $xml_commons_apis_jar_symlink_path = $webinf_lib_instance_path . "/" . $xml_commons_apis_jar_base_name; + $xml_commons_resolver_jar_symlink_path = $webinf_lib_instance_path + . "/" . $xml_commons_resolver_jar_base_name; $webapps_root_instance_path = $webapps_instance_path @@ -2754,6 +2764,10 @@ sub process_pki_files_and_symlinks return 0 if !create_symlink($xml_commons_apis_jar_symlink_path, $xml_commons_apis_jar_file_path, $pki_user, $pki_group); + # create instance symlink to "xml_commons_resolver.jar" + return 0 if !create_symlink($xml_commons_resolver_jar_symlink_path, $xml_commons_resolver_jar_file_path, + $pki_user, $pki_group); + } return 1; diff --git a/pki/base/silent/scripts/pkisilent b/pki/base/silent/scripts/pkisilent index 6a310c3f7..2141f3642 100755 --- a/pki/base/silent/scripts/pkisilent +++ b/pki/base/silent/scripts/pkisilent @@ -148,6 +148,7 @@ $ENV{CLASSPATH} = "/usr/share/java/${PRODUCT}/pki-silent.jar:" . "/usr/share/java/${PRODUCT}/pki-tools.jar:" . "/usr/share/java/ldapjdk.jar:" . "/usr/share/java/xerces-j2.jar:" + . "/usr/share/java/xml-commons-apis.jar:" . "/usr/share/java/xml-commons-resolver.jar:" . "/usr/lib/java/dirsec/jss4.jar:" . "/usr/lib/java/jss4.jar:" diff --git a/pki/specs/pki-core.spec b/pki/specs/pki-core.spec index d7701d1f1..24e1d4980 100644 --- a/pki/specs/pki-core.spec +++ b/pki/specs/pki-core.spec @@ -254,6 +254,8 @@ Requires: %{_javadir}/velocity.jar Requires: %{_javadir}/xalan-j2.jar Requires: %{_javadir}/xalan-j2-serializer.jar Requires: %{_javadir}/xerces-j2.jar +Requires: %{_javadir}/xml-commons-apis.jar +Requires: %{_javadir}/xml-commons-resolver.jar Requires: velocity %description -n pki-common |