diff options
author | Ade Lee <alee@redhat.com> | 2012-01-16 10:05:47 -0500 |
---|---|---|
committer | Ade Lee <alee@redhat.com> | 2012-01-16 16:18:10 -0500 |
commit | 1cbfacc7d4033f1527f0f80c1f93e8958993cc7e (patch) | |
tree | 01a6bbccf47a28e4710cbd36242e61f3a7e2707a /pki/base | |
parent | 2a01a782e8ff4fe0aa81741b8a673c41f081ca0b (diff) | |
download | pki-1cbfacc7d4033f1527f0f80c1f93e8958993cc7e.tar.gz pki-1cbfacc7d4033f1527f0f80c1f93e8958993cc7e.tar.xz pki-1cbfacc7d4033f1527f0f80c1f93e8958993cc7e.zip |
Changes to pkicreate to create resteasy links.
Added resteasy-jettison-provider to pki-setup as it is not currently delivered
by candlepin-deps.
Diffstat (limited to 'pki/base')
-rw-r--r-- | pki/base/setup/CMakeLists.txt | 11 | ||||
-rw-r--r-- | pki/base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar | bin | 0 -> 32378 bytes | |||
-rwxr-xr-x | pki/base/setup/pkicommon.pm | 6 | ||||
-rwxr-xr-x | pki/base/setup/pkicreate | 104 |
4 files changed, 119 insertions, 2 deletions
diff --git a/pki/base/setup/CMakeLists.txt b/pki/base/setup/CMakeLists.txt index 05f18332d..2ed50ee62 100644 --- a/pki/base/setup/CMakeLists.txt +++ b/pki/base/setup/CMakeLists.txt @@ -27,6 +27,17 @@ install( WORLD_EXECUTE WORLD_READ ) +install( + FILES + jars/resteasy-jettison-provider-2.3-RC1.jar + DESTINATION + ${JAVA_JAR_INSTALL_DIR} + PERMISSIONS + OWNER_EXECUTE OWNER_WRITE OWNER_READ + GROUP_EXECUTE GROUP_READ + WORLD_EXECUTE WORLD_READ +) + # install empty directories install(CODE "file(MAKE_DIRECTORY \$ENV{DESTDIR}${VAR_INSTALL_DIR}/lock/pki)") install(CODE "file(MAKE_DIRECTORY \$ENV{DESTDIR}${VAR_INSTALL_DIR}/run/pki)") diff --git a/pki/base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar b/pki/base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar Binary files differnew file mode 100644 index 000000000..da7106ddd --- /dev/null +++ b/pki/base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar diff --git a/pki/base/setup/pkicommon.pm b/pki/base/setup/pkicommon.pm index f8c304b91..6ce255303 100755 --- a/pki/base/setup/pkicommon.pm +++ b/pki/base/setup/pkicommon.pm @@ -184,6 +184,7 @@ our $default_ldapmodify_command = undef; our $default_modutil_command = undef; our $default_initscripts_path = undef; our $default_registry_path = undef; +my $candlepin_java_path = "/usr/share/candlepin/lib"; our $default_dir_permissions = 00770; our $default_exe_permissions = 00770; @@ -219,7 +220,7 @@ if ($^O eq "linux") { $default_java_path = "/usr/share/java"; $default_pki_java_path = "/usr/share/java/pki"; $default_system_jni_java_path = "/usr/lib/java"; - @default_jar_path = ($default_pki_java_path, $default_java_path, $default_system_jni_java_path); + @default_jar_path = ($default_pki_java_path, $default_java_path, $default_system_jni_java_path, $candlepin_java_path); } elsif ($default_hardware_platform eq "x86_64") { # 64-bit Linux $default_system_binaries = "/bin"; @@ -230,7 +231,8 @@ if ($^O eq "linux") { $default_pki_java_path = "/usr/share/java/pki"; $default_x86_64_jni_java_path = "/usr/lib64/java"; $default_system_jni_java_path = "/usr/lib/java"; - @default_jar_path = ($default_pki_java_path, $default_java_path, $default_x86_64_jni_java_path, $default_system_jni_java_path); + @default_jar_path = ($default_pki_java_path, $default_java_path, $default_x86_64_jni_java_path, + $default_system_jni_java_path, $candlepin_java_path); } else { emit("Unsupported '$^O' hardware platform '$default_hardware_platform'!", "error"); exit 255; diff --git a/pki/base/setup/pkicreate b/pki/base/setup/pkicreate index 82da22cea..528c9a423 100755 --- a/pki/base/setup/pkicreate +++ b/pki/base/setup/pkicreate @@ -186,6 +186,15 @@ my $tomcatjss_jar_base_name = "tomcatjss.jar"; # CA, KRA, OCSP, TKS my $velocity_jar_base_name = "velocity.jar"; # CA, KRA, OCSP, TKS my $xerces_jar_base_name = "xerces-j2.jar"; # CA, KRA, OCSP, TKS +# resteasy jars +my $javassist_jar_base_name = "javassist-3.9.0.GA.jar"; # CA, KRA, OCSP, TKS +my $jaxrs_api_jar_base_name = "jaxrs-api-2.2.1.GA.jar"; # CA, KRA, OCSP, TKS +my $resteasy_jaxb_provider_jar_base_name = "resteasy-jaxb-provider-2.2.1.GA.jar"; # CA, KRA, OCSP, TKS +my $resteasy_jaxrs_jar_base_name = "resteasy-jaxrs-2.2.1.GA.jar"; # CA, KRA, OCSP, TKS +my $scannotation_jar_base_name = "scannotation-1.0.2.jar"; # CA, KRA, OCSP, TKS +my $jettison_jar_base_name = "jettison.jar"; # CA, KRA, OCSP, TKS +my $resteasy_jettison_provider_jar_base_name = "resteasy-jettison-provider-2.3-RC1.jar"; # CA, KRA, OCSP, TKS + my $apache_commons_collections_jar_base_name = "apache-commons-collections.jar"; my $jakarta_commons_collections_jar_base_name = "jakarta-commons-collections.jar"; my $apache_commons_logging_jar_base_name = "apache-commons-logging.jar"; @@ -465,6 +474,20 @@ my $pki_cmscore_jar_file_path = undef; # CA, KRA, OCSP, TKS my $pki_cmscore_jar_symlink_path = undef; # CA, KRA, OCSP, TKS my $pki_cmsutil_jar_file_path = undef; # CA, KRA, OCSP, TKS my $pki_cmsutil_jar_symlink_path = undef; # CA, KRA, OCSP, TKS +my $javassist_jar_file_path = undef; # CA, KRA, OCSP, TKS +my $javassist_jar_symlink_path = undef; # CA, KRA, OCSP, TKS +my $jaxrs_api_jar_file_path = undef; # CA, KRA, OCSP, TKS +my $jaxrs_api_jar_symlink_path = undef; # CA, KRA, OCSP, TKS +my $resteasy_jaxb_provider_jar_file_path = undef; # CA, KRA, OCSP, TKS +my $resteasy_jaxb_provider_jar_symlink_path = undef; # CA, KRA, OCSP, TKS +my $resteasy_jaxrs_jar_file_path = undef; # CA, KRA, OCSP, TKS +my $resteasy_jaxrs_jar_symlink_path = undef; # CA, KRA, OCSP, TKS +my $scannotation_jar_file_path = undef; # CA, KRA, OCSP, TKS +my $scannotation_jar_symlink_path = undef; # CA, KRA, OCSP, TKS +my $jettison_jar_file_path = undef; # CA, KRA, OCSP, TKS +my $jettison_jar_symlink_path = undef; # CA, KRA, OCSP, TKS +my $resteasy_jettison_provider_jar_file_path = undef; # CA, KRA, OCSP, TKS +my $resteasy_jettison_provider_jar_symlink_path = undef; # CA, KRA, OCSP, TKS my $commons_collections_jar_file_path = undef; # CA, KRA, OCSP, TKS my $commons_collections_jar_symlink_path = undef; # CA, KRA, OCSP, TKS my $commons_lang_jar_file_path = undef; # CA, KRA, OCSP, TKS @@ -1850,6 +1873,41 @@ sub initialize_subdirectory_paths return 0; } + if (!defined($javassist_jar_file_path = find_jar($javassist_jar_base_name))) { + emit("could not find jar: $javassist_jar_base_name", "error"); + return 0; + } + + if (!defined($jaxrs_api_jar_file_path = find_jar($jaxrs_api_jar_base_name))) { + emit("could not find jar: $jaxrs_api_jar_base_name", "error"); + return 0; + } + + if (!defined($resteasy_jaxb_provider_jar_file_path = find_jar($resteasy_jaxb_provider_jar_base_name))) { + emit("could not find jar: $resteasy_jaxb_provider_jar_base_name", "error"); + return 0; + } + + if (!defined($resteasy_jaxrs_jar_file_path = find_jar($resteasy_jaxrs_jar_base_name))) { + emit("could not find jar: $resteasy_jaxrs_jar_base_name", "error"); + return 0; + } + + if (!defined($scannotation_jar_file_path = find_jar($scannotation_jar_base_name))) { + emit("could not find jar: $scannotation_jar_base_name", "error"); + return 0; + } + + if (!defined($resteasy_jettison_provider_jar_file_path = find_jar($resteasy_jettison_provider_jar_base_name))) { + emit("could not find jar: $resteasy_jettison_provider_jar_base_name", "error"); + return 0; + } + + if (!defined($jettison_jar_file_path = find_jar($jettison_jar_base_name))) { + emit("could not find jar: $jettison_jar_base_name", "error"); + return 0; + } + $webinf_instance_path = $webapps_instance_path . "/" . $subsystem_type . "/" . $webinf_base_instance_dir; @@ -1903,6 +1961,22 @@ sub initialize_subdirectory_paths $xml_commons_resolver_jar_symlink_path = $webinf_lib_instance_path . "/" . $xml_commons_resolver_jar_base_name; + #resteasy + $javassist_jar_symlink_path = $webinf_lib_instance_path + . "/" . $javassist_jar_base_name; + $jaxrs_api_jar_symlink_path = $webinf_lib_instance_path + . "/" . $jaxrs_api_jar_base_name; + $resteasy_jaxb_provider_jar_symlink_path = $webinf_lib_instance_path + . "/" . $resteasy_jaxb_provider_jar_base_name; + $resteasy_jaxrs_jar_symlink_path = $webinf_lib_instance_path + . "/" . $resteasy_jaxrs_jar_base_name; + $scannotation_jar_symlink_path = $webinf_lib_instance_path + . "/" . $scannotation_jar_base_name; + $resteasy_jettison_provider_jar_symlink_path = $webinf_lib_instance_path + . "/" . $resteasy_jettison_provider_jar_base_name; + $jettison_jar_symlink_path = $webinf_lib_instance_path + . "/" . $jettison_jar_base_name; + $webapps_root_instance_path = $webapps_instance_path . "/" @@ -2919,6 +2993,36 @@ sub process_pki_files_and_symlinks return 0 if !create_symlink($xml_commons_resolver_jar_symlink_path, $xml_commons_resolver_jar_file_path, $pki_user, $pki_group); + #resteasy + # create instance symlink to "javassist.jar" + return 0 if !create_symlink($javassist_jar_symlink_path, $javassist_jar_file_path, + $pki_user, $pki_group); + + # create instance symlink to "jaxrs-api.jar" + return 0 if !create_symlink($jaxrs_api_jar_symlink_path, $jaxrs_api_jar_file_path, + $pki_user, $pki_group); + + # create instance symlink to "pki-resteasy_jaxb_provider.jar" + return 0 if !create_symlink($resteasy_jaxb_provider_jar_symlink_path, $resteasy_jaxb_provider_jar_file_path, + $pki_user, $pki_group); + + # create instance symlink to "resteasy_jaxrs.jar" + return 0 if !create_symlink($resteasy_jaxrs_jar_symlink_path, $resteasy_jaxrs_jar_file_path, + $pki_user, $pki_group); + + # create instance symlink to "scannotation.jar" + return 0 if !create_symlink($scannotation_jar_symlink_path, $scannotation_jar_file_path, + $pki_user, $pki_group); + + # create instance symlink to "pki-resteasy_jettison_provider.jar" + return 0 if !create_symlink($resteasy_jettison_provider_jar_symlink_path, $resteasy_jettison_provider_jar_file_path, + $pki_user, $pki_group); + + # create instance symlink to "jettison.jar" + return 0 if !create_symlink($jettison_jar_symlink_path, $jettison_jar_file_path, + $pki_user, $pki_group); + + } return 1; |