diff options
Diffstat (limited to 'base/setup')
| -rw-r--r-- | base/setup/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar | bin | 32378 -> 0 bytes | |||
| -rwxr-xr-x | base/setup/pkicommon.pm | 6 | ||||
| -rwxr-xr-x | base/setup/pkicreate | 12 |
4 files changed, 9 insertions, 20 deletions
diff --git a/base/setup/CMakeLists.txt b/base/setup/CMakeLists.txt index 2ed50ee62..05f18332d 100644 --- a/base/setup/CMakeLists.txt +++ b/base/setup/CMakeLists.txt @@ -27,17 +27,6 @@ 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/base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar b/base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar Binary files differdeleted file mode 100644 index da7106ddd..000000000 --- a/base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar +++ /dev/null diff --git a/base/setup/pkicommon.pm b/base/setup/pkicommon.pm index 6ce255303..b96b9489c 100755 --- a/base/setup/pkicommon.pm +++ b/base/setup/pkicommon.pm @@ -184,7 +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"; +my $resteasy_path = "/usr/share/java/resteasy"; our $default_dir_permissions = 00770; our $default_exe_permissions = 00770; @@ -220,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, $candlepin_java_path); + @default_jar_path = ($default_pki_java_path, $default_java_path, $default_system_jni_java_path, $resteasy_path); } elsif ($default_hardware_platform eq "x86_64") { # 64-bit Linux $default_system_binaries = "/bin"; @@ -232,7 +232,7 @@ if ($^O eq "linux") { $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, $candlepin_java_path); + $default_system_jni_java_path, $resteasy_path); } else { emit("Unsupported '$^O' hardware platform '$default_hardware_platform'!", "error"); exit 255; diff --git a/base/setup/pkicreate b/base/setup/pkicreate index edde86ecc..19f268a00 100755 --- a/base/setup/pkicreate +++ b/base/setup/pkicreate @@ -187,13 +187,13 @@ 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 $javassist_jar_base_name = "javassist.jar"; # CA, KRA, OCSP, TKS +my $jaxrs_api_jar_base_name = "jaxrs-api.jar"; # CA, KRA, OCSP, TKS +my $resteasy_jaxb_provider_jar_base_name = "resteasy-jaxb-provider.jar"; # CA, KRA, OCSP, TKS +my $resteasy_jaxrs_jar_base_name = "resteasy-jaxrs.jar"; # CA, KRA, OCSP, TKS +my $scannotation_jar_base_name = "scannotation.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 $resteasy_jettison_provider_jar_base_name = "resteasy-jettison-provider.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"; |