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

4 files changed, 164 insertions, 30 deletions

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
 
 
 ###############################################################################
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 86968e22e..3dbf62363 100644
--- a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
+++ b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
@@ -124,24 +124,12 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
                 deployer.master_dict['pki_httpcore_jar_link'])
             deployer.symlink.create(deployer.master_dict['pki_javassist_jar'],
                 deployer.master_dict['pki_javassist_jar_link'])
-            deployer.symlink.create(deployer.master_dict['pki_resteasy_jaxrs_api_jar'],
-                deployer.master_dict['pki_resteasy_jaxrs_api_jar_link'])
-            deployer.symlink.create(deployer.master_dict['pki_jettison_jar'],
-                deployer.master_dict['pki_jettison_jar_link'])
             deployer.symlink.create(deployer.master_dict['pki_jss_jar'],
                 deployer.master_dict['pki_jss_jar_link'])
             deployer.symlink.create(deployer.master_dict['pki_ldapjdk_jar'],
                 deployer.master_dict['pki_ldapjdk_jar_link'])
             deployer.symlink.create(deployer.master_dict['pki_tomcat_jar'],
                 deployer.master_dict['pki_tomcat_jar_link'])
-            deployer.symlink.create(deployer.master_dict['pki_resteasy_atom_provider_jar'],
-                deployer.master_dict['pki_resteasy_atom_provider_jar_link'])
-            deployer.symlink.create(deployer.master_dict['pki_resteasy_jaxb_provider_jar'],
-                deployer.master_dict['pki_resteasy_jaxb_provider_jar_link'])
-            deployer.symlink.create(deployer.master_dict['pki_resteasy_jaxrs_jar'],
-                deployer.master_dict['pki_resteasy_jaxrs_jar_link'])
-            deployer.symlink.create(deployer.master_dict['pki_resteasy_jettison_provider_jar'],
-                deployer.master_dict['pki_resteasy_jettison_provider_jar_link'])
             deployer.symlink.create(deployer.master_dict['pki_scannotation_jar'],
                 deployer.master_dict['pki_scannotation_jar_link'])
             deployer.symlink.create(deployer.master_dict['pki_tomcatjss_jar'],
@@ -155,6 +143,78 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
             deployer.symlink.create(deployer.master_dict['pki_xml_commons_resolver_jar'],
                 deployer.master_dict['pki_xml_commons_resolver_jar_link'])
 
+            # Jackson
+            deployer.symlink.create(deployer.master_dict['pki_jackson_annotations_jar'],
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_common_lib_path'],
+                    'jackson-annotations.jar'))
+            deployer.symlink.create(deployer.master_dict['pki_jackson_core_asl_jar'],
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_common_lib_path'],
+                    'jackson-core-asl.jar'))
+            deployer.symlink.create(deployer.master_dict['pki_jackson_core_jar'],
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_common_lib_path'],
+                    'jackson-core.jar'))
+            deployer.symlink.create(deployer.master_dict['pki_jackson_databind_jar'],
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_common_lib_path'],
+                    'jackson-databind.jar'))
+            deployer.symlink.create(deployer.master_dict['pki_jackson_jaxrs_base_jar'],
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_common_lib_path'],
+                    'jackson-jaxrs-base.jar'))
+            deployer.symlink.create(deployer.master_dict['pki_jackson_jaxrs_jar'],
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_common_lib_path'],
+                    'jackson-jaxrs.jar'))
+            deployer.symlink.create(deployer.master_dict['pki_jackson_jaxrs_json_provider_jar'],
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_common_lib_path'],
+                    'jackson-jaxrs-json-provider.jar'))
+            deployer.symlink.create(deployer.master_dict['pki_jackson_mapper_asl_jar'],
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_common_lib_path'],
+                    'jackson-mapper-asl.jar'))
+            deployer.symlink.create(deployer.master_dict['pki_jackson_module_jaxb_annotations_jar'],
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_common_lib_path'],
+                    'jackson-module-jaxb-annotations.jar'))
+            deployer.symlink.create(deployer.master_dict['pki_jackson_mrbean_jar'],
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_common_lib_path'],
+                    'jackson-mrbean.jar'))
+            deployer.symlink.create(deployer.master_dict['pki_jackson_smile_jar'],
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_common_lib_path'],
+                    'jackson-smile.jar'))
+            deployer.symlink.create(deployer.master_dict['pki_jackson_xc_jar'],
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_common_lib_path'],
+                    'jackson-xc.jar'))
+
+            # RESTEasy
+            deployer.symlink.create(deployer.master_dict['pki_resteasy_atom_provider_jar'],
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_common_lib_path'],
+                    'resteasy-atom-provider.jar'))
+            deployer.symlink.create(deployer.master_dict['pki_resteasy_jaxb_provider_jar'],
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_common_lib_path'],
+                    'resteasy-jaxb-provider.jar'))
+            deployer.symlink.create(deployer.master_dict['pki_resteasy_jaxrs_api_jar'],
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_common_lib_path'],
+                    'jaxrs-api.jar'))
+            deployer.symlink.create(deployer.master_dict['pki_resteasy_jaxrs_jar'],
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_common_lib_path'],
+                    'resteasy-jaxrs.jar'))
+            deployer.symlink.create(deployer.master_dict['pki_resteasy_jackson_provider_jar'],
+                os.path.join(
+                    deployer.master_dict['pki_tomcat_common_lib_path'],
+                    'resteasy-jackson-provider.jar'))
+
             # establish shared NSS security databases for this instance
             deployer.directory.create(deployer.master_dict['pki_database_path'])
             # establish instance convenience symbolic links
diff --git a/base/server/scripts/operations b/base/server/scripts/operations
index 92c2f9611..21b4748a0 100644
--- a/base/server/scripts/operations
+++ b/base/server/scripts/operations
@@ -1223,14 +1223,25 @@ verify_symlinks()
             [httpcore.jar]=${java_dir}/httpcomponents/httpcore.jar
             [javassist.jar]=${java_dir}/javassist.jar
             [jaxrs-api.jar]=${RESTEASY_LIB}/jaxrs-api.jar
-            [jettison.jar]=${java_dir}/jettison.jar
+            [jackson-annotations.jar]=${java_dir}/jackson-annotations.jar
+            [jackson-core-asl.jar]=${java_dir}/jackson/jackson-core-asl.jar
+            [jackson-core.jar]=${java_dir}/jackson-core.jar
+            [jackson-databind.jar]=${java_dir}/jackson-databind.jar
+            [jackson-jaxrs-base.jar]=${java_dir}/jackson-jaxrs-providers/jackson-jaxrs-base.jar
+            [jackson-jaxrs.jar]=${java_dir}/jackson/jackson-jaxrs.jar
+            [jackson-jaxrs-json-provider.jar]=${java_dir}/jackson-jaxrs-providers/jackson-jaxrs-json-provider.jar
+            [jackson-mapper-asl.jar]=${java_dir}/jackson/jackson-mapper-asl.jar
+            [jackson-module-jaxb-annotations.jar]=${java_dir}/jackson-module-jaxb-annotations.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-jaxb-provider.jar]=${RESTEASY_LIB}/resteasy-jaxb-provider.jar
             [resteasy-jaxrs.jar]=${RESTEASY_LIB}/resteasy-jaxrs.jar
-            [resteasy-jettison-provider.jar]=${RESTEASY_LIB}/resteasy-jettison-provider.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
@@ -1248,14 +1259,25 @@ verify_symlinks()
             [httpcore.jar]=${java_dir}/httpcore.jar
             [javassist.jar]=${java_dir}/javassist.jar
             [jaxrs-api.jar]=${RESTEASY_LIB}/jaxrs-api.jar
-            [jettison.jar]=${java_dir}/jettison.jar
+            [jackson-annotations.jar]=${java_dir}/jackson-annotations.jar
+            [jackson-core-asl.jar]=${java_dir}/jackson/jackson-core-asl.jar
+            [jackson-core.jar]=${java_dir}/jackson-core.jar
+            [jackson-databind.jar]=${java_dir}/jackson-databind.jar
+            [jackson-jaxrs-base.jar]=${java_dir}/jackson-jaxrs-providers/jackson-jaxrs-base.jar
+            [jackson-jaxrs.jar]=${java_dir}/jackson/jackson-jaxrs.jar
+            [jackson-jaxrs-json-provider.jar]=${java_dir}/jackson-jaxrs-providers/jackson-jaxrs-json-provider.jar
+            [jackson-mapper-asl.jar]=${java_dir}/jackson/jackson-mapper-asl.jar
+            [jackson-module-jaxb-annotations.jar]=${java_dir}/jackson-module-jaxb-annotations.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-jaxb-provider.jar]=${RESTEASY_LIB}/resteasy-jaxb-provider.jar
             [resteasy-jaxrs.jar]=${RESTEASY_LIB}/resteasy-jaxrs.jar
-            [resteasy-jettison-provider.jar]=${RESTEASY_LIB}/resteasy-jettison-provider.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
diff --git a/base/server/share/conf/pki.policy b/base/server/share/conf/pki.policy
index df9157e70..5ce07b2cf 100644
--- a/base/server/share/conf/pki.policy
+++ b/base/server/share/conf/pki.policy
@@ -98,7 +98,51 @@ grant codeBase "file:/usr/share/java/jboss-web.jar" {
         permission java.security.AllPermission;
 };
 
-grant codeBase "file:/usr/share/java/jettison.jar" {
+grant codeBase "file:/usr/share/java/jackson-annotations.jar" {
+        permission java.security.AllPermission;
+};
+
+grant codeBase "file:/usr/share/java/jackson/jackson-core-asl.jar" {
+        permission java.security.AllPermission;
+};
+
+grant codeBase "file:/usr/share/java/jackson-core.jar" {
+        permission java.security.AllPermission;
+};
+
+grant codeBase "file:/usr/share/java/jackson-databind.jar" {
+        permission java.security.AllPermission;
+};
+
+grant codeBase "file:/usr/share/java/jackson-jaxrs-providers/jackson-jaxrs-base.jar" {
+        permission java.security.AllPermission;
+};
+
+grant codeBase "file:/usr/share/java/jackson/jackson-jaxrs.jar" {
+        permission java.security.AllPermission;
+};
+
+grant codeBase "file:/usr/share/java/jackson-jaxrs-providers/jackson-jaxrs-json-provider.jar" {
+        permission java.security.AllPermission;
+};
+
+grant codeBase "file:/usr/share/java/jackson/jackson-mapper-asl.jar" {
+        permission java.security.AllPermission;
+};
+
+grant codeBase "file:/usr/share/java/jackson-module-jaxb-annotations.jar" {
+        permission java.security.AllPermission;
+};
+
+grant codeBase "file:/usr/share/java/jackson/jackson-mrbean.jar" {
+        permission java.security.AllPermission;
+};
+
+grant codeBase "file:/usr/share/java/jackson/jackson-smile.jar" {
+        permission java.security.AllPermission;
+};
+
+grant codeBase "file:/usr/share/java/jackson/jackson-xc.jar" {
         permission java.security.AllPermission;
 };
 
@@ -126,7 +170,7 @@ grant codeBase "file:${RESTEASY_LIB}/resteasy-jaxrs.jar" {
         permission java.security.AllPermission;
 };
 
-grant codeBase "file:${RESTEASY_LIB}/resteasy-jettison-provider.jar" {
+grant codeBase "file:${RESTEASY_LIB}/resteasy-jackson-provider.jar" {
         permission java.security.AllPermission;
 };