From 11c7985988eb1bf2fc979cc38094b794a814e2a4 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Tue, 27 Mar 2012 12:09:05 -0500 Subject: Replaced Candlepin with RESTEasy. Previously the code depends on the old RESTEasy libraries provided by Candlepin package. Now the Eclipse classpath, build/setup scripts, and the spec file have been updated to use the libraries provided by the new RESTEasy package. Ticket #29 --- base/common/src/CMakeLists.txt | 8 ++++---- base/deploy/CMakeLists.txt | 11 ----------- base/setup/CMakeLists.txt | 11 ----------- base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar | Bin 32378 -> 0 bytes base/setup/pkicommon.pm | 6 +++--- base/setup/pkicreate | 12 ++++++------ 6 files changed, 13 insertions(+), 35 deletions(-) delete mode 100644 base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar (limited to 'base') diff --git a/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt index 7a7c38a44..01ff33e47 100644 --- a/base/common/src/CMakeLists.txt +++ b/base/common/src/CMakeLists.txt @@ -64,16 +64,16 @@ find_file(XERCES_JAR find_file(JAXRS_API_JAR NAMES - jaxrs-api-2.2.1.GA.jar + jaxrs-api.jar PATHS - /usr/share/candlepin/lib + /usr/share/java/resteasy ) find_file(RESTEASY_JAXRS_JAR NAMES - resteasy-jaxrs-2.2.1.GA.jar + resteasy-jaxrs.jar PATHS - /usr/share/candlepin/lib + /usr/share/java/resteasy ) set(pki-certsrv_java_SRCS diff --git a/base/deploy/CMakeLists.txt b/base/deploy/CMakeLists.txt index 11d70c55d..65c3eacc0 100644 --- a/base/deploy/CMakeLists.txt +++ b/base/deploy/CMakeLists.txt @@ -63,17 +63,6 @@ install( \"\$ENV{DESTDIR}${PYTHON_SITE_PACKAGES}/pki/deployment/__init__.py\")" ) -#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/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 deleted file mode 100644 index da7106ddd..000000000 Binary files a/base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar and /dev/null differ 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"; -- cgit