From 32d71bba0075a3bc12c36e5bb29701d0e96ea0ba Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Tue, 28 Jan 2014 21:42:43 -0500 Subject: Replaced Jettison with Jackson. The Jettison library has been replaced with Jackson library as JSON provider for RESTEasy. All class paths and the deployment tools have been updated accordingly. The Python library and the TPS UI have been updated as well to use the new JSON format. Ticket #817 --- base/server/etc/default.cfg | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) (limited to 'base/server/etc') diff --git a/base/server/etc/default.cfg b/base/server/etc/default.cfg index 94d34b201..e60cb3a14 100644 --- a/base/server/etc/default.cfg +++ b/base/server/etc/default.cfg @@ -283,20 +283,14 @@ 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_jettison_jar=/usr/share/java/jettison.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_resteasy_jaxrs_api_jar=%(resteasy_lib)s/jaxrs-api.jar pki_nsutil=/usr/share/java/pki/pki-nsutil.jar pki_tomcat_jar=/usr/share/java/pki/pki-tomcat.jar -pki_resteasy_atom_provider_jar=%(resteasy_lib)s/resteasy-atom-provider.jar -pki_resteasy_jaxb_provider_jar=%(resteasy_lib)s/resteasy-jaxb-provider.jar -pki_resteasy_jaxrs_jar=%(resteasy_lib)s/resteasy-jaxrs.jar -pki_resteasy_jettison_provider_jar=%(resteasy_lib)s/resteasy-jettison-provider.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 @@ -313,14 +307,8 @@ pki_commons_codec_jar_link=%(pki_tomcat_common_lib_path)s/apache-commons-codec.j 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_resteasy_jaxrs_api_jar_link=%(pki_tomcat_common_lib_path)s/jaxrs-api.jar -pki_jettison_jar_link=%(pki_tomcat_common_lib_path)s/jettison.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_resteasy_atom_provider_jar_link=%(pki_tomcat_common_lib_path)s/resteasy-atom-provider.jar -pki_resteasy_jaxb_provider_jar_link=%(pki_tomcat_common_lib_path)s/resteasy-jaxb-provider.jar -pki_resteasy_jaxrs_jar_link=%(pki_tomcat_common_lib_path)s/resteasy-jaxrs.jar -pki_resteasy_jettison_provider_jar_link=%(pki_tomcat_common_lib_path)s/resteasy-jettison-provider.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 @@ -338,6 +326,26 @@ 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_annotations_jar=/usr/share/java/jackson-annotations.jar +pki_jackson_core_asl_jar=/usr/share/java/jackson/jackson-core-asl.jar +pki_jackson_core_jar=/usr/share/java/jackson-core.jar +pki_jackson_databind_jar=/usr/share/java/jackson-databind.jar +pki_jackson_jaxrs_base_jar=/usr/share/java/jackson-jaxrs-providers/jackson-jaxrs-base.jar +pki_jackson_jaxrs_jar=/usr/share/java/jackson/jackson-jaxrs.jar +pki_jackson_jaxrs_json_provider_jar=/usr/share/java/jackson-jaxrs-providers/jackson-jaxrs-json-provider.jar +pki_jackson_mapper_asl_jar=/usr/share/java/jackson/jackson-mapper-asl.jar +pki_jackson_module_jaxb_annotations_jar=/usr/share/java/jackson-module-jaxb-annotations.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_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 ############################################################################### -- cgit