diff options
| -rw-r--r-- | base/server/CMakeLists.txt | 47 | ||||
| -rw-r--r-- | base/server/etc/default.cfg | 82 | ||||
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/instance_layout.py | 143 | ||||
| -rw-r--r-- | base/server/scripts/operations | 79 |
4 files changed, 54 insertions, 297 deletions
diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt index 5a6aea96a..27470f385 100644 --- a/base/server/CMakeLists.txt +++ b/base/server/CMakeLists.txt @@ -21,6 +21,53 @@ set(APACHE_SUBSYSTEMS tps ) +# Create /usr/share/pki/server/common/lib. This can be customized for different platforms in RPM spec. + +add_custom_target(pki-server-common-lib ALL) + +add_custom_command( + TARGET pki-server-common-lib + COMMAND ${CMAKE_COMMAND} -E make_directory common/lib + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/commons-codec.jar common/lib/commons-codec.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/commons-collections.jar common/lib/commons-collections.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/commons-io.jar common/lib/commons-io.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/commons-lang.jar common/lib/commons-lang.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/commons-logging.jar common/lib/commons-logging.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/httpcomponents/httpclient.jar common/lib/httpclient.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/httpcomponents/httpcore.jar common/lib/httpcore.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/jackson/jackson-core-asl.jar common/lib/jackson-core-asl.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/jackson/jackson-jaxrs.jar common/lib/jackson-jaxrs.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/jackson/jackson-mapper-asl.jar common/lib/jackson-mapper-asl.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/jackson/jackson-mrbean.jar common/lib/jackson-mrbean.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/jackson/jackson-smile.jar common/lib/jackson-smile.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/jackson/jackson-xc.jar common/lib/jackson-xc.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/javassist.jar common/lib/javassist.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/lib/java/jss4.jar common/lib/jss4.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/ldapjdk.jar common/lib/ldapjdk.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/lib/java/nuxwdog.jar common/lib/nuxwdog.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/pki/pki-tomcat.jar common/lib/pki-tomcat.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/resteasy-atom-provider.jar common/lib/resteasy-atom-provider.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/resteasy-client.jar common/lib/resteasy-client.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/resteasy-jackson-provider.jar common/lib/resteasy-jackson-provider.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/resteasy-jaxb-provider.jar common/lib/resteasy-jaxb-provider.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/jaxrs-api.jar common/lib/resteasy-jaxrs-api.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/resteasy-jaxrs.jar common/lib/resteasy-jaxrs.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/scannotation.jar common/lib/scannotation.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/lib/java/symkey.jar common/lib/symkey.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/tomcatjss.jar common/lib/tomcatjss.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/velocity.jar common/lib/velocity.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/xerces-j2.jar common/lib/xerces-j2.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/xml-commons-apis.jar common/lib/xml-commons-apis.jar + COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/xml-commons-resolver.jar common/lib/xml-commons-resolver.jar +) + +install( + DIRECTORY + ${CMAKE_CURRENT_BINARY_DIR}/common/lib/ + DESTINATION + ${DATA_INSTALL_DIR}/server/common/lib +) + install( DIRECTORY man/ diff --git a/base/server/etc/default.cfg b/base/server/etc/default.cfg index edd263220..4919cb46d 100644 --- a/base/server/etc/default.cfg +++ b/base/server/etc/default.cfg @@ -268,88 +268,6 @@ pki_tomcat_subsystem_webapps_path=%(pki_subsystem_path)s/webapps pki_tomcat_webapps_subsystem_path=%(pki_tomcat_subsystem_webapps_path)s/%(pki_subsystem_type)s pki_tomcat_webapps_subsystem_webinf_classes_path=%(pki_tomcat_webapps_subsystem_path)s/WEB-INF/classes pki_tomcat_webapps_subsystem_webinf_lib_path=%(pki_tomcat_webapps_subsystem_path)s/WEB-INF/lib -pki_certsrv_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-certsrv.jar -pki_cmsbundle_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-cmsbundle.jar -pki_cmscore_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-cmscore.jar -pki_cms_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-cms.jar -pki_cmsutil_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-cmsutil.jar -pki_nsutil_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-nsutil.jar - - -# JAR paths -# These are used in the processing of pkispawn and are not supposed -# to be overwritten by user configuration files -pki_jss_jar=%(jni_jar_dir)s/jss4.jar -pki_symkey_jar=%(jni_jar_dir)s/symkey.jar -pki_apache_commons_collections_jar=/usr/share/java/apache-commons-collections.jar -pki_apache_commons_io_jar=/usr/share/java/apache-commons-io.jar -pki_apache_commons_lang_jar=/usr/share/java/apache-commons-lang.jar -pki_apache_commons_logging_jar=/usr/share/java/apache-commons-logging.jar -pki_commons_codec_jar=/usr/share/java/commons-codec.jar -pki_httpclient_jar=/usr/share/java/httpcomponents/httpclient.jar -pki_httpcore_jar=/usr/share/java/httpcomponents/httpcore.jar -pki_javassist_jar=/usr/share/java/javassist.jar -pki_ldapjdk_jar=/usr/share/java/ldapjdk.jar -pki_certsrv_jar=/usr/share/java/pki/pki-certsrv.jar -pki_cmsbundle=/usr/share/java/pki/pki-cmsbundle.jar -pki_cmscore=/usr/share/java/pki/pki-cmscore.jar -pki_cms=/usr/share/java/pki/pki-cms.jar -pki_cmsutil=/usr/share/java/pki/pki-cmsutil.jar -pki_nsutil=/usr/share/java/pki/pki-nsutil.jar -pki_tomcat_jar=/usr/share/java/pki/pki-tomcat.jar -pki_scannotation_jar=/usr/share/java/scannotation.jar -pki_tomcatjss_jar=/usr/share/java/tomcatjss.jar -pki_velocity_jar=/usr/share/java/velocity.jar -pki_xerces_j2_jar=/usr/share/java/xerces-j2.jar -pki_xml_commons_apis_jar=/usr/share/java/xml-commons-apis.jar -pki_xml_commons_resolver_jar=/usr/share/java/xml-commons-resolver.jar -pki_jss_jar_link=%(pki_tomcat_common_lib_path)s/jss4.jar -pki_symkey_jar_link=%(pki_tomcat_common_lib_path)s/symkey.jar -pki_apache_commons_collections_jar_link=%(pki_tomcat_common_lib_path)s/apache-commons-collections.jar -pki_apache_commons_io_jar_link=%(pki_tomcat_common_lib_path)s/apache-commons-io.jar -pki_apache_commons_lang_jar_link=%(pki_tomcat_common_lib_path)s/apache-commons-lang.jar -pki_apache_commons_logging_jar_link=%(pki_tomcat_common_lib_path)s/apache-commons-logging.jar -pki_commons_codec_jar_link=%(pki_tomcat_common_lib_path)s/apache-commons-codec.jar -pki_httpclient_jar_link=%(pki_tomcat_common_lib_path)s/httpclient.jar -pki_httpcore_jar_link=%(pki_tomcat_common_lib_path)s/httpcore.jar -pki_javassist_jar_link=%(pki_tomcat_common_lib_path)s/javassist.jar -pki_ldapjdk_jar_link=%(pki_tomcat_common_lib_path)s/ldapjdk.jar -pki_tomcat_jar_link=%(pki_tomcat_common_lib_path)s/pki-tomcat.jar -pki_scannotation_jar_link=%(pki_tomcat_common_lib_path)s/scannotation.jar -pki_tomcatjss_jar_link=%(pki_tomcat_common_lib_path)s/tomcatjss.jar -pki_velocity_jar_link=%(pki_tomcat_common_lib_path)s/velocity.jar -pki_xerces_j2_jar_link=%(pki_tomcat_common_lib_path)s/xerces-j2.jar -pki_xml_commons_apis_jar_link=%(pki_tomcat_common_lib_path)s/xml-commons-apis.jar -pki_xml_commons_resolver_jar_link=%(pki_tomcat_common_lib_path)s/xml-commons-resolver.jar -pki_ca_jar=/usr/share/java/pki/pki-ca.jar -pki_ca_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-ca.jar -pki_kra_jar=/usr/share/java/pki/pki-kra.jar -pki_kra_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-kra.jar -pki_ocsp_jar=/usr/share/java/pki/pki-ocsp.jar -pki_ocsp_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-ocsp.jar -pki_tks_jar=/usr/share/java/pki/pki-tks.jar -pki_tks_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-tks.jar -pki_tps_jar=/usr/share/java/pki/pki-tps.jar -pki_tps_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-tps.jar - -# Jackson -pki_jackson_core_asl_jar=/usr/share/java/jackson/jackson-core-asl.jar -pki_jackson_jaxrs_jar=/usr/share/java/jackson/jackson-jaxrs.jar -pki_jackson_mapper_asl_jar=/usr/share/java/jackson/jackson-mapper-asl.jar -pki_jackson_mrbean_jar=/usr/share/java/jackson/jackson-mrbean.jar -pki_jackson_smile_jar=/usr/share/java/jackson/jackson-smile.jar -pki_jackson_xc_jar=/usr/share/java/jackson/jackson-xc.jar - -# RESTEasy -pki_resteasy_atom_provider_jar=%(resteasy_lib)s/resteasy-atom-provider.jar -pki_resteasy_client_jar=%(resteasy_lib)s/resteasy-client.jar -pki_resteasy_jaxb_provider_jar=%(resteasy_lib)s/resteasy-jaxb-provider.jar -pki_resteasy_jaxrs_api_jar=%(resteasy_lib)s/jaxrs-api.jar -pki_resteasy_jaxrs_jar=%(resteasy_lib)s/resteasy-jaxrs.jar -pki_resteasy_jackson_provider_jar=%(resteasy_lib)s/resteasy-jackson-provider.jar - -# nuxwdog -pki_nuxwdog_client_jar=/usr/lib/java/nuxwdog.jar ############################################################################### diff --git a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py index 57f8537e0..c470c7f94 100644 --- a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py +++ b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py @@ -122,11 +122,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): "localhost", "pki#js.xml")) - # establish Tomcat instance base - deployer.directory.create(deployer.mdict['pki_tomcat_common_path']) - deployer.directory.create( - deployer.mdict['pki_tomcat_common_lib_path']) - # establish Tomcat instance library + # Create Tomcat instance library deployer.directory.create(deployer.mdict['pki_instance_lib']) for name in os.listdir(deployer.mdict['pki_tomcat_lib_path']): deployer.symlink.create( @@ -139,6 +135,12 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): deployer.symlink.create( deployer.mdict['pki_instance_conf_log4j_properties'], deployer.mdict['pki_instance_lib_log4j_properties']) + + # Link /var/lib/pki/<instance>/common to /usr/share/pki/server/common + deployer.symlink.create( + '/usr/share/pki/server/common', + deployer.mdict['pki_tomcat_common_path']) + deployer.directory.create(deployer.mdict['pki_tomcat_tmpdir_path']) deployer.directory.create(deployer.mdict['pki_tomcat_work_path']) @@ -160,129 +162,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): deployer.mdict['pki_tomcat_systemd'], deployer.mdict['pki_instance_systemd_link'], uid=0, gid=0) - # establish Tomcat instance common lib jar symbolic links - deployer.symlink.create( - deployer.mdict['pki_apache_commons_collections_jar'], - deployer.mdict['pki_apache_commons_collections_jar_link']) - deployer.symlink.create( - deployer.mdict['pki_apache_commons_io_jar'], - deployer.mdict['pki_apache_commons_io_jar_link']) - deployer.symlink.create( - deployer.mdict['pki_apache_commons_lang_jar'], - deployer.mdict['pki_apache_commons_lang_jar_link']) - deployer.symlink.create( - deployer.mdict['pki_apache_commons_logging_jar'], - deployer.mdict['pki_apache_commons_logging_jar_link']) - deployer.symlink.create( - deployer.mdict['pki_commons_codec_jar'], - deployer.mdict['pki_commons_codec_jar_link']) - deployer.symlink.create( - deployer.mdict['pki_httpclient_jar'], - deployer.mdict['pki_httpclient_jar_link']) - deployer.symlink.create( - deployer.mdict['pki_httpcore_jar'], - deployer.mdict['pki_httpcore_jar_link']) - deployer.symlink.create( - deployer.mdict['pki_javassist_jar'], - deployer.mdict['pki_javassist_jar_link']) - deployer.symlink.create( - deployer.mdict['pki_jss_jar'], - deployer.mdict['pki_jss_jar_link']) - deployer.symlink.create( - deployer.mdict['pki_ldapjdk_jar'], - deployer.mdict['pki_ldapjdk_jar_link']) - deployer.symlink.create( - deployer.mdict['pki_tomcat_jar'], - deployer.mdict['pki_tomcat_jar_link']) - deployer.symlink.create( - deployer.mdict['pki_scannotation_jar'], - deployer.mdict['pki_scannotation_jar_link']) - deployer.symlink.create( - deployer.mdict['pki_tomcatjss_jar'], - deployer.mdict['pki_tomcatjss_jar_link']) - deployer.symlink.create( - deployer.mdict['pki_velocity_jar'], - deployer.mdict['pki_velocity_jar_link']) - deployer.symlink.create( - deployer.mdict['pki_xerces_j2_jar'], - deployer.mdict['pki_xerces_j2_jar_link']) - deployer.symlink.create( - deployer.mdict['pki_xml_commons_apis_jar'], - deployer.mdict['pki_xml_commons_apis_jar_link']) - deployer.symlink.create( - deployer.mdict['pki_xml_commons_resolver_jar'], - deployer.mdict['pki_xml_commons_resolver_jar_link']) - - # Jackson - deployer.symlink.create( - deployer.mdict['pki_jackson_core_asl_jar'], - os.path.join( - deployer.mdict['pki_tomcat_common_lib_path'], - 'jackson-core-asl.jar')) - deployer.symlink.create( - deployer.mdict['pki_jackson_jaxrs_jar'], - os.path.join( - deployer.mdict['pki_tomcat_common_lib_path'], - 'jackson-jaxrs.jar')) - deployer.symlink.create( - deployer.mdict['pki_jackson_mapper_asl_jar'], - os.path.join( - deployer.mdict['pki_tomcat_common_lib_path'], - 'jackson-mapper-asl.jar')) - deployer.symlink.create( - deployer.mdict['pki_jackson_mrbean_jar'], - os.path.join( - deployer.mdict['pki_tomcat_common_lib_path'], - 'jackson-mrbean.jar')) - deployer.symlink.create( - deployer.mdict['pki_jackson_smile_jar'], - os.path.join( - deployer.mdict['pki_tomcat_common_lib_path'], - 'jackson-smile.jar')) - deployer.symlink.create( - deployer.mdict['pki_jackson_xc_jar'], - os.path.join( - deployer.mdict['pki_tomcat_common_lib_path'], - 'jackson-xc.jar')) - - # RESTEasy - deployer.symlink.create( - deployer.mdict['pki_resteasy_atom_provider_jar'], - os.path.join( - deployer.mdict['pki_tomcat_common_lib_path'], - 'resteasy-atom-provider.jar')) - deployer.symlink.create( - deployer.mdict['pki_resteasy_client_jar'], - os.path.join( - deployer.mdict['pki_tomcat_common_lib_path'], - 'resteasy-client.jar')) - deployer.symlink.create( - deployer.mdict['pki_resteasy_jaxb_provider_jar'], - os.path.join( - deployer.mdict['pki_tomcat_common_lib_path'], - 'resteasy-jaxb-provider.jar')) - deployer.symlink.create( - deployer.mdict['pki_resteasy_jaxrs_api_jar'], - os.path.join( - deployer.mdict['pki_tomcat_common_lib_path'], - 'jaxrs-api.jar')) - deployer.symlink.create( - deployer.mdict['pki_resteasy_jaxrs_jar'], - os.path.join( - deployer.mdict['pki_tomcat_common_lib_path'], - 'resteasy-jaxrs.jar')) - deployer.symlink.create( - deployer.mdict['pki_resteasy_jackson_provider_jar'], - os.path.join( - deployer.mdict['pki_tomcat_common_lib_path'], - 'resteasy-jackson-provider.jar')) - - # nuxwdog - deployer.symlink.create( - deployer.mdict['pki_nuxwdog_client_jar'], - os.path.join( - deployer.mdict['pki_tomcat_common_lib_path'], - 'nuxwdog.jar')) # establish shared NSS security databases for this instance deployer.directory.create(deployer.mdict['pki_database_path']) @@ -297,14 +176,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): deployer.mdict['pki_instance_log_path'], deployer.mdict['pki_instance_logs_link']) - # create the sym link to symkey regardless of subsystem - # as long as pki-symkey is installed on the system - if os.path.exists(deployer.mdict['pki_symkey_jar']): - if not os.path.exists(deployer.mdict['pki_symkey_jar_link']): - deployer.symlink.create( - deployer.mdict['pki_symkey_jar'], - deployer.mdict['pki_symkey_jar_link']) - # create Tomcat instance systemd service link deployer.symlink.create(deployer.mdict['pki_systemd_service'], deployer.mdict['pki_systemd_service_link']) diff --git a/base/server/scripts/operations b/base/server/scripts/operations index 599167008..5b5017891 100644 --- a/base/server/scripts/operations +++ b/base/server/scripts/operations @@ -909,7 +909,6 @@ verify_symlinks() declare -A ocsp_symlinks declare -A tks_symlinks declare -A tps_symlinks - declare -A common_jar_symlinks declare -A ca_jar_symlinks declare -A kra_jar_symlinks declare -A ocsp_jar_symlinks @@ -985,75 +984,6 @@ verify_symlinks() [logs]=/var/log/pki/${PKI_INSTANCE_NAME}/tps [registry]=${pki_registry_dir}) - # '${pki_common_jar_dir}' symlinks - if ! $debian; then - common_jar_symlinks=( - [apache-commons-codec.jar]=${java_dir}/commons-codec.jar - [apache-commons-collections.jar]=${java_dir}/apache-commons-collections.jar - [apache-commons-io.jar]=${java_dir}/apache-commons-io.jar - [apache-commons-lang.jar]=${java_dir}/apache-commons-lang.jar - [apache-commons-logging.jar]=${java_dir}/apache-commons-logging.jar - [httpclient.jar]=${java_dir}/httpcomponents/httpclient.jar - [httpcore.jar]=${java_dir}/httpcomponents/httpcore.jar - [javassist.jar]=${java_dir}/javassist.jar - [jaxrs-api.jar]=${RESTEASY_LIB}/jaxrs-api.jar - [jackson-core-asl.jar]=${java_dir}/jackson/jackson-core-asl.jar - [jackson-jaxrs.jar]=${java_dir}/jackson/jackson-jaxrs.jar - [jackson-mapper-asl.jar]=${java_dir}/jackson/jackson-mapper-asl.jar - [jackson-mrbean.jar]=${java_dir}/jackson/jackson-mrbean.jar - [jackson-smile.jar]=${java_dir}/jackson/jackson-smile.jar - [jackson-xc.jar]=${java_dir}/jackson/jackson-xc.jar - [jss4.jar]=${jni_jar_dir}/jss4.jar - [ldapjdk.jar]=${java_dir}/ldapjdk.jar - [pki-tomcat.jar]=${java_dir}/pki/pki-tomcat.jar - [resteasy-atom-provider.jar]=${RESTEASY_LIB}/resteasy-atom-provider.jar - [resteasy-client.jar]=${RESTEASY_LIB}/resteasy-client.jar - [resteasy-jaxb-provider.jar]=${RESTEASY_LIB}/resteasy-jaxb-provider.jar - [resteasy-jaxrs.jar]=${RESTEASY_LIB}/resteasy-jaxrs.jar - [resteasy-jackson-provider.jar]=${RESTEASY_LIB}/resteasy-jackson-provider.jar - [scannotation.jar]=${java_dir}/scannotation.jar - [tomcatjss.jar]=${java_dir}/tomcatjss.jar - [velocity.jar]=${java_dir}/velocity.jar - [xerces-j2.jar]=${java_dir}/xerces-j2.jar - [xml-commons-apis.jar]=${java_dir}/xml-commons-apis.jar - [xml-commons-resolver.jar]=${java_dir}/xml-commons-resolver.jar) - else - common_jar_symlinks=( - [apache-commons-codec.jar]=${java_dir}/commons-codec.jar - [apache-commons-collections.jar]=${java_dir}/commons-collections3.jar - [apache-commons-io.jar]=${java_dir}/commons-io.jar - [apache-commons-lang.jar]=${java_dir}/commons-lang.jar - [apache-commons-logging.jar]=${java_dir}/commons-logging.jar - [httpclient.jar]=${java_dir}/httpclient.jar - [httpcore.jar]=${java_dir}/httpcore.jar - [javassist.jar]=${java_dir}/javassist.jar - [jaxrs-api.jar]=${RESTEASY_LIB}/jaxrs-api.jar - [jackson-core-asl.jar]=${java_dir}/jackson-core-asl.jar - [jackson-jaxrs.jar]=${java_dir}/jackson-jaxrs.jar - [jackson-mapper-asl.jar]=${java_dir}/jackson-mapper-asl.jar - [jackson-mrbean.jar]=${java_dir}/jackson-mrbean.jar - [jackson-smile.jar]=${java_dir}/jackson-smile.jar - [jackson-xc.jar]=${java_dir}/jackson-xc.jar - [jss4.jar]=${jni_jar_dir}/jss4.jar - [ldapjdk.jar]=${java_dir}/ldapjdk.jar - [pki-tomcat.jar]=${java_dir}/pki/pki-tomcat.jar - [resteasy-atom-provider.jar]=${RESTEASY_LIB}/resteasy-atom-provider.jar - [resteasy-client.jar]=${RESTEASY_LIB}/resteasy-client.jar - [resteasy-jaxb-provider.jar]=${RESTEASY_LIB}/resteasy-jaxb-provider.jar - [resteasy-jaxrs.jar]=${RESTEASY_LIB}/resteasy-jaxrs.jar - [resteasy-jackson-provider.jar]=${RESTEASY_LIB}/resteasy-jackson-provider.jar - [scannotation.jar]=${java_dir}/scannotation.jar - [tomcatjss.jar]=${java_dir}/tomcatjss.jar - [velocity.jar]=${java_dir}/velocity.jar - [xerces-j2.jar]=${java_dir}/xercesImpl.jar - [xml-commons-apis.jar]=${java_dir}/xml-apis.jar - [xml-commons-resolver.jar]=${java_dir}/xml-resolver.jar) - fi - - if [ -e ${PKI_INSTANCE_PATH}/tks ]; then - common_jar_symlinks[symkey.jar]=${jni_jar_dir}/symkey.jar - fi - # '${pki_systemd_dir}' symlinks systemd_symlinks[${pki_systemd_link}]=${systemd_dir}/${pki_systemd_service} @@ -1132,15 +1062,6 @@ verify_symlinks() fi fi - # Detect and correct 'common_jar_symlinks' - common_jar_symlinks_string=$(declare -p common_jar_symlinks) - eval "declare -A symlinks=${common_jar_symlinks_string#*=}" - check_symlinks ${pki_common_jar_dir} ${PKI_USER} ${PKI_GROUP} - rv=$? - if [ $rv -ne 0 ]; then - return $rv - fi - # Detect and correct 'systemd_symlinks' systemd_symlinks_string=$(declare -p systemd_symlinks) eval "declare -A symlinks=${systemd_symlinks_string#*=}" |